From 3cc468703cb525bfcb1d9a1089c8e8c335e66487 Mon Sep 17 00:00:00 2001
From: admin <418351270@qq.com>
Date: 星期五, 12 一月 2024 08:35:28 +0800
Subject: [PATCH] 添加查询
---
guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js | 292 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 192 insertions(+), 100 deletions(-)
diff --git a/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js b/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js
index 0ed2916..f5b7be0 100644
--- a/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js
+++ b/guns-vip-main/src/main/webapp/assets/modular/kb/materialRegistration/materialRegistration.js
@@ -31,11 +31,12 @@
async function initPageInfo() {
await initKanBanConfInfo();//鍒濆鍖栭厤缃俊鎭�
await initOrderInfo();
- initBomTable();
+ // initBomTable();
initMaterialShortage();
/* xR();
xa();*/
}
+
@@ -87,7 +88,7 @@
function initBomTable(){
var queryData = {};
- queryData['loadingCode'] = $("#locationCode").val();
+ // queryData['loadingCode'] = $("#locationCode").val();
// queryData['workOrderNo'] = $("#workOrderNo").val();
// 娓叉煋琛ㄦ牸
@@ -115,7 +116,7 @@
// {field: 'workorderNo', sort: true, title: '宸ュ崟缂栧彿'},
// {field: 'productCode', sort: true, title: '浜у搧缂栧彿'},
{field: 'locationCode', sort: true, title: '宸ヤ綅缂栧彿'},
- {field: 'loadingCode', sort: true, title: '涓婃枡宸ヤ綅缂栧彿'},
+ // {field: 'loadingCode', sort: true, title: '涓婃枡宸ヤ綅缂栧彿'},
// {field: 'state', sort: true, title: '鏄惁鎵爜'},
// {field: 'batchCode', sort: true, title: '鎵规鐮�'},
]];
@@ -126,22 +127,28 @@
*/
MaterialShortage.initColumn = function () {
return [[
- {type: 'numbers'},
+ {type: 'checkbox', fixed: 'left'},
+
{field: 'id', hide: true, title: 'ID'},
- {field: 'workOrderNo', sort: true, title: '宸ュ崟鍙�', width: 165},
+ /* {field: 'workOrderNo', sort: true, title: '宸ュ崟鍙�', width: 150},*/
// {field: 'loadingCode', sort: true, title: '涓婃枡宸ヤ綅', width: 105},
- {field: 'locationCode', sort: true, title: '宸ヤ綅缂栧彿', width: 105},
- {field: 'loadingCode', sort: true, title: '鎵爜宸ヤ綅缂栧彿', width: 105},
- {field: 'materialCode', sort: true, title: '鐗╂枡缂栫爜'},
- {field: 'barCode', sort: true, title: '鎵爜缂栧彿'},
- {field: 'state', sort: true, title: '鏄惁鎵爜', width: 105},
+ {field: 'locationCode', sort: true, title: '宸ヤ綅缂栧彿', width: 100},
+ //{field: 'loadingCode', sort: true, title: '鎵爜宸ヤ綅缂栧彿', width: 105},
+ {field: 'materialCode', sort: true, title: '鐗╂枡缂栫爜', width: 170},
+ {field: 'batch', sort: true, title: '鐗╂枡鎵规',width: 120},
+ {field: 'quantity', sort: true, title: '涓婃枡鏁伴噺',width: 120},
+ {field: 'residueQuantity', sort: true, title: '鍓╀綑鏁伴噺',width: 120},
+ {field: 'unit', sort: true, title: '鍗曚綅'},
+ {field: 'status', sort: true, title: '鏄惁涓婃枡', width: 105,templet: '#stateTpl'},
+ // {field: 'orderStatus', sort: true, title: '鐘舵��',align:'center',width:80,templet: '#orderStatusTpl'},
+
]];
};
function initMaterialShortage(){
var queryData = {};
queryData['workOrderNo'] = $("#workOrderNo").val();
- queryData['loadingCode'] = $("#locationCode").val();
+ // queryData['loadingCode'] = $("#locationCode").val();
// 娓叉煋琛ㄦ牸
var tableResult = table.render({
@@ -149,10 +156,36 @@
url: Feng.ctxPath + '/productionOrderBatchInfo/boardList',
// page: true,
height: 345,
+ toolbar: '#toolbarDemo',
cellMinWidth: 80,
where:queryData,
cols: MaterialShortage.initColumn()
});
+ }
+
+ // 宸ュ叿鏍忎簨浠�
+ table.on('toolbar(materialShortageTable)', function(obj){
+ var id = obj.config.id;
+ var checkStatus = table.checkStatus(id);
+ switch(obj.event){
+ case 'getCheckData':
+ var data = checkStatus.data;
+ console.log(data.length)
+ console.log(data)
+ if(data.length!==1){
+ Feng.error("璇锋纭�夋嫨涓�鏉℃暟鎹�")
+ return
+ }
+ resetting(data[0].id)
+ break;
+ };
+ });
+
+ function resetting(data){
+ var resetting = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/resetting?id=" + data);
+ var resettingResult = resetting.start();
+ initMaterialShortage()
+ Feng.success("閲嶇疆鎴愬姛")
}
// 鐢熶骇宸ュ崟璁剧疆鎸夐挳鐐瑰嚮浜嬩欢
@@ -239,56 +272,114 @@
});
};
- $("#barCode").bind("keydown",function(e){
- // 鍏煎FF鍜孖E鍜孫pera
- var theEvent = e || window.event;
- var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
- if (code === 13) {
- var ajax1 = new $ax(Feng.ctxPath + "/bomInfo/bomCheck?materialCode=" +$('#barCode').val()+"&loadingCode="+$('#locationCode').val());
- var result1 = ajax1.start();
- console.log(result1.data);
- if(result1.data!==0) {
- //鍥炶溅鎵ц鏌ヨ
- var ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/barCodeCheck?materialCode=" + $('#barCode').val() + "&workOrderNo=" + $('#workOrderNo').val());
- var result = ajax.start();
- console.log(result.data);
- if (result.data === 0) {
- let ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateState", function (data) {
- }, function (data) {
- Feng.error("娣诲姞澶辫触锛�" + data.responseJSON.message)
- });
- ajax.set("materialCode", $('#barCode').val());
- ajax.set("workOrderNo", $('#workOrderNo').val());
- ajax.set("state", "鏄�");
- ajax.start();
- // initBomTable();
- initMaterialShortage();
- } else {
- layer.open({
- title: "鎿嶄綔鎻愮ず",
- icon: 0,
- closeBtn: 2,
- area: ['450px', '160px'],
- time: 5000,
- content: '<span style="font-size: 30px;color: red">璇ユ爣绛惧凡琚壂鎻�!!!</span>'
- });
- }
- }else {
- layer.open({
- title: "鎿嶄綔鎻愮ず",
- icon: 0,
- closeBtn: 2,
- area: ['450px', '160px'],
- time: 5000,
- content: '<span style="font-size: 30px;color: red">BOM鏍￠獙閿欒璇烽噸鏂版壂鐮�!!!</span>'
- });
- }
- }
- });
+ // $("#barCode").bind("keydown",function(e){
+ // // 鍏煎FF鍜孖E鍜孫pera
+ // var theEvent = e || window.event;
+ // var code = theEvent.keyCode || theEvent.which || theEvent.charCode;
+ // if (code === 13) {
+ // var ajax1 = new $ax(Feng.ctxPath + "/bomInfo/bomCheck?materialCode=" +$('#barCode').val()+"&loadingCode="+$('#locationCode').val());
+ // var result1 = ajax1.start();
+ // console.log(result1.data);
+ // if(result1.data!==0) {
+ // //鍥炶溅鎵ц鏌ヨ
+ // var ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/barCodeCheck?materialCode=" + $('#barCode').val() + "&workOrderNo=" + $('#workOrderNo').val());
+ // var result = ajax.start();
+ // console.log(result.data);
+ // if (result.data === 0) {
+ // let ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateState", function (data) {
+ // }, function (data) {
+ // Feng.error("娣诲姞澶辫触锛�" + data.responseJSON.message)
+ // });
+ // ajax.set("materialCode", $('#barCode').val());
+ // ajax.set("workOrderNo", $('#workOrderNo').val());
+ // ajax.set("state", "鏄�");
+ // ajax.start();
+ // // initBomTable();
+ // initMaterialShortage();
+ // } else {
+ // layer.open({
+ // title: "鎿嶄綔鎻愮ず",
+ // icon: 0,
+ // closeBtn: 2,
+ // area: ['450px', '160px'],
+ // time: 5000,
+ // content: '<span style="font-size: 30px;color: red">璇ユ爣绛惧凡琚壂鎻�!!!</span>'
+ // });
+ // }
+ // }else {
+ // layer.open({
+ // title: "鎿嶄綔鎻愮ず",
+ // icon: 0,
+ // closeBtn: 2,
+ // area: ['450px', '160px'],
+ // time: 5000,
+ // content: '<span style="font-size: 30px;color: red">BOM鏍￠獙閿欒璇烽噸鏂版壂鐮�!!!</span>'
+ // });
+ // }
+ // }
+ // });
$('#btnClean').click(function (){
- $('#barCode').val("");
+ clean()
});
+
+ function clean(){
+ $('#barCode').val("");
+ $('#number').val("");
+ }
+ $('#confirm').click(function (){
+ inputMethod($('#barCode').val());
+ // let barCode = $('#barCode').val();
+ // let batch = barCode.substring(14,25);
+ // let number = $('#number').val();
+ // if(barCode === '' || number === ''){
+ // Feng.error("璇疯緭鍏ユ潯鐮佸拰鏁伴噺鐨勫畬鏁翠俊鎭�");
+ // return
+ // }else if(barCode.length!==25){
+ // Feng.error("璇疯緭鍏ュ畬鏁撮暱搴︿俊鎭�");
+ // return
+ // }
+ // var checkLocationCode = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/checkLocationCode?materialCode=" + barCode.substring(0, 14) + "&workOrderNo="+ $('#workOrderNo').val());
+ // var checkLocationCodeResult = checkLocationCode.start();
+ // if(checkLocationCodeResult.data === 0){
+ // Feng.error("鏉＄爜淇℃伅寮傚父")
+ // return
+ // }
+ // var updateOrderBatchInfo = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateOrderBatchInfo?materialCode=" + barCode.substring(0, 14) + "&workOrderNo="+ $('#workOrderNo').val()+ "&spareField1="+ number + "&loadingCode="+ batch);
+ // var updateOrderBatchInfoResult = updateOrderBatchInfo.start();
+ // Feng.success("褰曞叆鎴愬姛")
+ // clean()
+ // initMaterialShortage()
+ });
+
+ function inputMethod(inBarCode){
+ let barCode = inBarCode;
+ let batch = barCode.substring(14,25);
+ let number = $('#number').val();
+ if(barCode === '' || number === ''){
+ Feng.error("璇疯緭鍏ユ潯鐮佸拰鏁伴噺鐨勫畬鏁翠俊鎭�");
+ return
+ }else if(barCode.length!==25){
+ Feng.error("璇疯緭鍏ュ畬鏁撮暱搴︿俊鎭�");
+ return
+ }
+ // var checkLocationCode = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/checkLocationCode?materialCode=" + barCode.substring(0, 14) + "&workOrderNo="+ $('#workOrderNo').val());
+ // var checkLocationCodeResult = checkLocationCode.start();
+ // if(checkLocationCodeResult.data === 0){
+ // Feng.error("鏉＄爜淇℃伅寮傚父")
+ // return
+ // }
+ var updateOrderBatchInfo = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateOrderBatchInfo?materialCode=" + barCode.substring(0, 14) + "&workOrderNo="+ $('#workOrderNo').val()+ "&quantity="+ number + "&batch="+ batch+ "&residueQuantity="+ number);
+ var updateOrderBatchInfoResult = updateOrderBatchInfo.start();
+ if(updateOrderBatchInfoResult.data === "0"){
+ Feng.error("鎵规涓嶅悓鏃犳硶褰曞叆");
+ return;
+ }
+ Feng.success("褰曞叆鎴愬姛")
+ clean()
+ initMaterialShortage()
+ }
+
var websocket = null;
//鍒ゆ柇褰撳墠娴忚鍣ㄦ槸鍚︽敮鎸乄ebSocket
@@ -301,48 +392,49 @@
}
//鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶
websocket.onmessage = function(event) {
- console.log(event);
- console.log(event.data)
- $('#barCode').val(event.data);
- var ajax1 = new $ax(Feng.ctxPath + "/bomInfo/bomCheck?materialCode=" +$('#barCode').val()+"&loadingCode="+$('#locationCode').val());
- var result1 = ajax1.start();
- console.log(result1.data);
- if(result1.data!==0) {
- //鍥炶溅鎵ц鏌ヨ
- var ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/barCodeCheck?materialCode=" + $('#barCode').val() + "&workOrderNo=" + $('#workOrderNo').val());
- var result = ajax.start();
- console.log(result.data);
- if (result.data === 0) {
- let ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateState", function (data) {
- }, function (data) {
- Feng.error("娣诲姞澶辫触锛�" + data.responseJSON.message)
- });
- ajax.set("materialCode", $('#barCode').val());
- ajax.set("workOrderNo", $('#workOrderNo').val());
- ajax.set("state", "鏄�");
- ajax.start();
- // initBomTable();
- initMaterialShortage();
- } else {
- layer.open({
- title: "鎿嶄綔鎻愮ず",
- icon: 0,
- closeBtn: 2,
- area: ['450px', '160px'],
- time: 5000,
- content: '<span style="font-size: 30px;color: red">璇ユ爣绛惧凡琚壂鎻�!!!</span>'
- });
- }
- }else {
- layer.open({
- title: "鎿嶄綔鎻愮ず",
- icon: 0,
- closeBtn: 2,
- area: ['450px', '160px'],
- time: 5000,
- content: '<span style="font-size: 30px;color: red">BOM鏍￠獙閿欒璇烽噸鏂版壂鐮�!!!</span>'
- });
- }
+ inputMethod(event.data);
+ // console.log(event);
+ // console.log(event.data)
+ // $('#barCode').val(event.data);
+ // var ajax1 = new $ax(Feng.ctxPath + "/bomInfo/bomCheck?materialCode=" +$('#barCode').val()+"&loadingCode="+$('#locationCode').val());
+ // var result1 = ajax1.start();
+ // console.log(result1.data);
+ // if(result1.data!==0) {
+ // //鍥炶溅鎵ц鏌ヨ
+ // var ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/barCodeCheck?materialCode=" + $('#barCode').val() + "&workOrderNo=" + $('#workOrderNo').val());
+ // var result = ajax.start();
+ // console.log(result.data);
+ // if (result.data === 0) {
+ // let ajax = new $ax(Feng.ctxPath + "/productionOrderBatchInfo/updateState", function (data) {
+ // }, function (data) {
+ // Feng.error("娣诲姞澶辫触锛�" + data.responseJSON.message)
+ // });
+ // ajax.set("materialCode", $('#barCode').val());
+ // ajax.set("workOrderNo", $('#workOrderNo').val());
+ // ajax.set("state", "鏄�");
+ // ajax.start();
+ // // initBomTable();
+ // initMaterialShortage();
+ // } else {
+ // layer.open({
+ // title: "鎿嶄綔鎻愮ず",
+ // icon: 0,
+ // closeBtn: 2,
+ // area: ['450px', '160px'],
+ // time: 5000,
+ // content: '<span style="font-size: 30px;color: red">璇ユ爣绛惧凡琚壂鎻�!!!</span>'
+ // });
+ // }
+ // }else {
+ // layer.open({
+ // title: "鎿嶄綔鎻愮ず",
+ // icon: 0,
+ // closeBtn: 2,
+ // area: ['450px', '160px'],
+ // time: 5000,
+ // content: '<span style="font-size: 30px;color: red">BOM鏍￠獙閿欒璇烽噸鏂版壂鐮�!!!</span>'
+ // });
+ // }
}
//杩炴帴鎴愬姛寤虹珛鐨勫洖璋冩柟娉�
--
Gitblit v1.9.3