diff --git a/pom.xml b/pom.xml index 6df2e60..85786ee 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,6 @@ - commons-net commons-net diff --git a/src/main/resources/static/pda/js/produce/produce_accept.js b/src/main/resources/static/pda/js/produce/produce_accept.js index 6ba0330..91540da 100644 --- a/src/main/resources/static/pda/js/produce/produce_accept.js +++ b/src/main/resources/static/pda/js/produce/produce_accept.js @@ -44,7 +44,7 @@ function scanRollNo(rollNo){ var tempData = data.obj; if (code=='200') { // 刷新页面 - window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0"; + window.document.location.href = "/pda/produceAccept?titleName=''&menuId=0"; // 更新供应商编码 } else if (code=='500') { layer.msg(data.msg); diff --git a/src/main/resources/static/pda/js/produce/produce_roll_nos.js b/src/main/resources/static/pda/js/produce/produce_roll_nos.js index 2d38ef9..5ce5d1b 100644 --- a/src/main/resources/static/pda/js/produce/produce_roll_nos.js +++ b/src/main/resources/static/pda/js/produce/produce_roll_nos.js @@ -36,10 +36,10 @@ function delRollNo(rollNo,orderNo,tags){ $("#roll_nums").val(current_roll_nums); $("#show_roll_nums").html(current_roll_nums); if(current_roll_nums==0){ - window.document.location.href = "/pda/pdaBase"; + window.document.location.href = "/pda/produceAccept?titleName=''&menuId=0"; } } else if (code=='500') { - window.document.location.href = "/pda/procuce/produceRollNos"; + window.document.location.href = "/pda/produce/produceRollNos"; } }, error : function(data) { diff --git a/src/main/resources/static/pda/js/receipt/receipt_order.js b/src/main/resources/static/pda/js/receipt/receipt_order.js index 219d92b..76e52f1 100644 --- a/src/main/resources/static/pda/js/receipt/receipt_order.js +++ b/src/main/resources/static/pda/js/receipt/receipt_order.js @@ -211,11 +211,15 @@ function endCurrentScan(){ layer.closeAll('dialog'); }); }else{ + layer.msg(code+"122313156"); var outData = data.obj; var outShow = '状态有误的卷号：'; - for(var i = 0;i - + @@ -27,7 +27,7 @@
- + 融欣MES - 生产收货
@@ -36,27 +36,27 @@
生产订单号：
-
${rollNos.orderNo }
- +
${rollNos.orderNo!'' }
+
物料编码：
-
${rollNos.partNo }
- +
${rollNos.partNo!'' }
+
物料描述：
-
${rollNos.partDes }
+
${rollNos.partDes!'' }
单卷数量：
-
${rollNos.nums }
- +
${rollNos.nums!'' }
+
卷数：
-
${rollNos.rollNums }
- +
${rollNos.rollNums!'' }
+
@@ -125,7 +125,7 @@
- + 返回
diff --git a/src/main/resources/templates/receipt/matter_roll.ftl b/src/main/resources/templates/receipt/matter_roll.ftl index beebf80..73da0ab 100644 --- a/src/main/resources/templates/receipt/matter_roll.ftl +++ b/src/main/resources/templates/receipt/matter_roll.ftl @@ -31,7 +31,7 @@
- + 融欣MES - 收货采购订单