From a5cdddc4efbed56871a38f187a324a60ad9d7ad7 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 3 Apr 2025 17:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A2=8B=E8=A3=85=E6=8B=86=E8=A2=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../board/service/impl/BoardServiceImpl.java  |  1 +
 .../impl/PrintLabelRecordServiceImpl.java     |  4 ++
 .../js/pda/transferWarehousingForHunlian.js   |  2 +-
 .../js/pda/transferWarehousingScanLabel.js    | 38 +++++++++++++++----
 .../pda/transferWarehousingScanLabel.ftl      |  3 ++
 5 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
index dadd85c..b9cd3b7 100644
--- a/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
+++ b/src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java
@@ -764,6 +764,7 @@ public class BoardServiceImpl implements BoardService {
         }
         packagePrintData.setPrintId(printLabelRecord.getItemNo());
         List<PackagePrintData> resultList = new ArrayList<>();
+        packagePrintData.setUnitQty(printLabelRecord.getPrintQty().doubleValue());
         resultList.add(packagePrintData);
         return resultList;
     }
diff --git a/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java
index ec6fc32..ed7b24e 100644
--- a/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/PrintLabelRecordServiceImpl.java
@@ -163,6 +163,10 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl<PrintLabelRecordMap
         if (!orderNo.equals(record.getOrderNo())){
             throw new RuntimeException("生成订单号与入库通知单生产订单号不匹配");
         }
+//
+//        if (Objects.isNull(record.getSeqNo()) || record.getSeqNo().equals(one.getScanSeqNo())){
+//            throw new RuntimeException("入库通知单和袋贴派工单号不匹配");
+//        }
     }
 
     @Override
diff --git a/src/main/resources/static/js/pda/transferWarehousingForHunlian.js b/src/main/resources/static/js/pda/transferWarehousingForHunlian.js
index 0f29740..73e916c 100644
--- a/src/main/resources/static/js/pda/transferWarehousingForHunlian.js
+++ b/src/main/resources/static/js/pda/transferWarehousingForHunlian.js
@@ -117,7 +117,7 @@ function pageJump(){
         layer.msg("当前无入库通知单信息！");
         return false
     }
-    if(currentData.lotSize <=currentData.finishedQty ){
+    if(currentData.lotSize <= currentData.finishedQty ){
         layer.msg("该通知单已入库完毕无需再次入库！");
         return false
     }
diff --git a/src/main/resources/static/js/pda/transferWarehousingScanLabel.js b/src/main/resources/static/js/pda/transferWarehousingScanLabel.js
index 1d21a51..32469d4 100644
--- a/src/main/resources/static/js/pda/transferWarehousingScanLabel.js
+++ b/src/main/resources/static/js/pda/transferWarehousingScanLabel.js
@@ -24,6 +24,9 @@ $(function(){
     var workData = $.cookie("transFer");
     if(workData != null && workData !==""){
         currentData = JSON.parse(workData);
+        if (currentData.preLotSize){
+            currentData.lotSize = currentData.preLotSize
+        }
         $("#warehouseQty").val(currentData.lotSize);
         if(currentData.weightFactor!='0'&&currentData.weightFactor!=''&&currentData.weightFactor!=null){
             $("#warehouseQtyKG").val((currentData.lotSize*currentData.weightFactor).toFixed(1));
@@ -54,6 +57,7 @@ function initPageProp(preDate){
     $("#partDesc").val(preDate.partDescription)
     $("#scanQty").val(0)
     $("#scanWeight").val(0)
+    console.log(preDate)
 }
 
 
@@ -66,7 +70,8 @@ function queryQrCode(){
 
     var jsonData = {
         qrCodeContent:qrCode,
-        orderNo:currentData.orderNo
+        orderNo:currentData.orderNo,
+        seqNo: currentData.seqNo
     }
     $.ajax({
         url: "/pad/checkScanLabelByTransfer",
@@ -129,36 +134,54 @@ function onPushScanTable(){
         return
     }
     labelList.push(print)
+
+    onloadTable();
+}
+
+
+function onloadTable(){
     // 操作dom,为dom
     let domStr = "";
-
     // 获得总数和总重量
     let totalQty = 0;
     for (let i = 0; i < labelList.length; i++) {
         let row = labelList[i];
+        if (totalQty + currentData.finishedQty + row.qty > currentData.lotSize){
+            layer.msg("入库数量超出通知单数量")
+            labelList.splice(i,1)
+            continue
+        }
         totalQty += row.qty
-        domStr += `<tr id="${print.seqNo}_${print.itemNo}">
+        domStr += `<tr id="${row.seqNo}_${row.itemNo}">
                             <th class="" style="text-align:center;background-color: #ffff;width: 5%;">
                                 <span>${i+1}</span>
                             </th>
                             <th class="" style="text-align:center;background-color: #ffff;width: 15%;">
-                                <span>${print.partNo}</span>
+                                <span>${row.partNo}</span>
+                            </th>
+                            <th class="" style="text-align:center;background-color: #ffff;width: 10%;">
+                                <span>${row.qty}</span>
                             </th>
                             <th class="" style="text-align:center;background-color: #ffff;width: 10%;">
-                                <span>${print.qty}</span>
+                                <span>${row.qtyWeight}</span>
                             </th>
                             <th class="" style="text-align:center;background-color: #ffff;width: 10%;">
-                                <span>${print.qtyWeight}</span>
+                                <span onclick="removeLabel(${i})">删除</span>
                             </th>
                         </tr>`
     }
-
     $("#issue_table").html("").append(domStr);
     $("#scanQty").val(totalQty)
     $("#scanWeight").val((totalQty * parseFloat(currentData.weightFactor)).toFixed(1))
 }
 
 
+function removeLabel(index){
+    labelList.splice(index,1)
+    onloadTable();
+    layer.msg("操作成功")
+}
+
 //下级界面页面跳转
 function pageJump(){
     if(currentData == null){
@@ -173,6 +196,7 @@ function pageJump(){
         layer.msg("未扫描标签")
         return
     }
+    currentData.preLotSize = currentData.lotSize
     currentData.lotSize = parseFloat($("#scanQty").val())
     if (currentData.lotSize === 0){
         layer.msg("扫描数量为0")
diff --git a/src/main/resources/templates/pda/transferWarehousingScanLabel.ftl b/src/main/resources/templates/pda/transferWarehousingScanLabel.ftl
index be35244..4c9d353 100644
--- a/src/main/resources/templates/pda/transferWarehousingScanLabel.ftl
+++ b/src/main/resources/templates/pda/transferWarehousingScanLabel.ftl
@@ -148,6 +148,9 @@
                                 <th class="" style="text-align:center;width: 10%;">
                                     <span>重量</span>
                                 </th>
+                                <th class="" style="text-align:center;width: 10%;">
+                                    <span>操作</span>
+                                </th>
                             </tr>
                         </thead>
                     </table>