From 83f43e10184a91b8858d0ff69293b5d2cd05a115 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 21 Nov 2022 16:30:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outbill/service/impl/CheckOutBillServiceImpl.java  | 10 ++++++++--
 lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue  |  5 ++---
 lms/nladmin-ui/src/views/wms/st/outbill/index.vue      |  5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 829c01195..fff789380 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -1401,12 +1401,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             for (int j = 0; j < rows.size(); j++) {
                 JSONObject ivt = rows.getJSONObject(j);
 
-                double canuse_qty = ivt.getDoubleValue("plan_qty");
+                double canuse_qty = ivt.getDoubleValue("ivt_qty");
                 if (unassign_qty >= canuse_qty) {
                     unassign_qty = unassign_qty - canuse_qty;
                     ivt.put("change_qty", canuse_qty + "");
                 } else {
-                    ivt.put("change_qty", unassign_qty + "");
+                    ivt.put("change_qty", canuse_qty + "");
                     unassign_qty = 0;
                 }
                 //更新库存
@@ -1634,6 +1634,12 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             from_start.put("lock_type", "1");
             from_start.put("storagevehicle_code", "");
             storPublicService.updateStructAndPoint(from_start);
+
+            // 更新子卷包装关系表 状态 - 3
+            JSONObject jsonSub = subTab.query("container_name = '" + dis.getString("pcsn") + "' and status = '2'").uniqueResult(0);
+            if (ObjectUtil.isEmpty(jsonSub)) throw new BadRequestException("此子卷不存在或不为入库状态："+dis.getString("pcsn"));
+            jsonSub.put("status", "3");
+            subTab.update(jsonSub);
         }
 
         /*
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
index eb73a43a6..c2eca012f 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
@@ -179,16 +179,15 @@ export default {
       }
     },
     handleEdit(index, row) {
-      debugger
       // 判断是否可以关闭编辑状态
       if (row.edit === undefined) {
         this.$set(row, 'edit', false)
       }
       if (!row.edit) {
-        if (row.plan_qty > this.queryrow.unassign_qty) {
+   /*     if (row.plan_qty > this.queryrow.unassign_qty) {
           this.crud.notify('出库重量不能超过未分配数', CRUD.NOTIFICATION_TYPE.INFO)
           return false
-        }
+        }*/
         if (row.plan_qty > row.canuse_qty) {
           this.crud.notify('出库重量不能超过库存可出重量', CRUD.NOTIFICATION_TYPE.INFO)
           return false
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index 0fa43d3d7..487e4f499 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -158,13 +158,14 @@
         <el-table-column
           v-permission="['admin','checkoutbill:del','checkoutbill:edit']"
           label="操作"
-          width="200"
+          width="250"
           align="center"
           fixed="right"
         >
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
+              style="display: inline"
               :permission="permission"
               :disabled-edit="canUd(scope.row)"
               :disabled-dle="canUd(scope.row)"
@@ -178,7 +179,7 @@
             </el-button>
             <el-button
               type="text"
-              icon="el-icon-upload"
+              icon="el-icon-printer"
               @click="print(scope.row)"
             >
               打印