From 4fb3a59f398ef1d5524c7d51b7deccd6318e65c6 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 25 Mar 2024 13:53:03 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=E5=87=BA=E5=BA=93=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8F=91=E8=B4=A7=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=9B=9E=E4=BC=A0sap=E4=BC=98=E5=8C=962.=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=AF=E5=90=A6=E8=B6=85=E6=9C=9F=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CheckOutBillServiceImpl.java        | 12 +++++++-----
 .../src/views/wms/st/outbill/DivDialog.vue           |  2 +-
 lms/nladmin-ui/src/views/wms/st/outbill/index.vue    |  2 +-
 3 files changed, 9 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 185fbcb52..edb050f96 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
@@ -5432,12 +5432,14 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
 
         // 判断单据是否是完成状态：只回传完成状态的单据
         if (jsonMst.getString("bill_status").equals("99")) {
-            JSONArray jsonArr = new JSONArray();
-            jsonArr.add(jsonMst);
+            if (!jsonMst.getString("upload_sap").equals("1")) {
+                JSONArray jsonArr = new JSONArray();
+                jsonArr.add(jsonMst);
 
-            JSONObject param = new JSONObject();
-            param.put("rows", jsonArr);
-            inAndOutReturnService.uploadSAP(param);
+                JSONObject param = new JSONObject();
+                param.put("rows", jsonArr);
+                inAndOutReturnService.uploadSAP(param);
+            }
         }
     }
 
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
index 5f3cdc1c9..35b5dd343 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
@@ -179,7 +179,7 @@
           <el-form-item prop="checked">
             <el-checkbox v-model="checked">是否异常出库</el-checkbox>
           </el-form-item>
-          <el-form-item label="超期发货('否'为正常出库发货):" prop="is_overdue">
+          <el-form-item label="超期发货('否'为正常库存发货):" prop="is_overdue">
             <el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">是</el-radio>
             <el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">否</el-radio>
           </el-form-item>
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 812698c2c..716565c56 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -319,7 +319,7 @@
         <el-table-column show-overflow-tooltip label="交货单号" align="center" prop="vbeln" width="100" />
         <el-table-column show-overflow-tooltip label="是否回传" align="center" prop="is_upload" width="80" :formatter="formatIsUpload" />
         <el-table-column show-overflow-tooltip :formatter="create_modeFormat" prop="create_mode" label="生成方式" width="100" />
-        <el-table-column show-overflow-tooltip :formatter="isOverdue" prop="is_overdue" label="是否超期发货('否'为正常出库发货)" width="120" />
+        <el-table-column show-overflow-tooltip :formatter="isOverdue" prop="is_overdue" label="是否超期发货('否'为正常库存发货)" width="220" />
         <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
         <el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
         <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />