成品信息批量回传添加生产类型相同的限制

易文鹏
1 parent 30177bfe
Showing 2 changed files with 6 additions and 2 deletions
src/main/java/com/huaheng/api/erp/service/TaskReturnServiceImpl.java
src/main/resources/templates/barcode/barCodeHeader/barCodeHeader.html
@@ -173,10 +173,10 @@ public class TaskReturnServiceImpl implements TaskReturnService {
                 //拆解
             } else {
                 //没有子条码的就取重量
-                if (barCodeDetail.getCode().length() < 1) {
+                if (barCodeHeader.getReceiptNote()==-1) {
                    count+=barCodeDetail.getWeight().intValue();
                 }else{
-                    count+=list.get(i).getTotalLines();
+                    count+=list.get(i).getReceiptNote();
                 }
                 fentity.setFstock("CK008");//拆解产物仓
             }
@@ -782,6 +782,10 @@
                     $.modal.alertWarning("【MES自建】的单据无需回传");
                     return;
                 }
+                if (rows[i].proType!==rows[0].proType){
+                    $.modal.alertWarning("【生产类型】要全部相同才能批量回传");
+                    return;
+                }
                 ids = ids + rows[i].id + ","
             }
             var data = { "ids": ids.substring(0, ids.length-1) };