From ada0aaf330b1beb637b60230a56df3f91c358b72 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 1 Aug 2024 06:55:02 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 46 +++++++++++--------
 .../service/impl/EmisWaybillServiceImpl.java  |  8 ++--
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 3f8b3abf8..da07708f0 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -610,24 +610,24 @@ public class EmisWaybillController extends EmisBaseController
     }
 
 
-//    @JacksonFilter(include= {
-//            "id","orderSn","billCode","orderStatus","waybillStatus",
-//            "orderType","sendDate","customerCode","customerName",
-//            "receiveName",
-//            "receiveCountry","receiveCountryName",
-//            "receiveProvince","receiveProvinceName",
-//            "receiveCity", "receiveCityName",
-//            "sendName",
-//            "sendCountry","sendCountryName",
-//            "sendProvince","sendProvinceName",
-//            "sendCity","sendCityName",
-//            "transLineType","transLineTypeName",
-//            "productType","productTypeName",
-//            "sendSiteName","destinationName",
-//            "dispatchUnderlingSiteName",
-//
-//
-//    },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    @JacksonFilter(include= {
+            "id","orderSn","billCode","orderStatus","waybillStatus",
+            "orderType","sendDate","customerCode","customerName",
+            "receiveName",
+            "receiveCountry","receiveCountryName",
+            "receiveProvince","receiveProvinceName",
+            "receiveCity", "receiveCityName",
+            "sendName",
+            "sendCountry","sendCountryName",
+            "sendProvince","sendProvinceName",
+            "sendCity","sendCityName",
+            "transLineType","transLineTypeName",
+            "productType","productTypeName",
+            "sendSiteName","destinationName",
+            "dispatchUnderlingSiteName",
+
+
+    },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
     @GetMapping("/listSimple")
     public TableDataInfo listSimple(EmisWaybill emisWaybill)
     {
@@ -636,6 +636,16 @@ public class EmisWaybillController extends EmisBaseController
         // 设置通用权限查询参数
         setPrivParams(emisWaybill);
 
+        // 如果不带查询本人开单的数据
+        if(StringUtils.isEmpty(emisWaybill.getBillCode())){
+            try {
+                emisWaybill.setRegisterManCode(getLoginUser().getUser().getEmpCode());
+            }catch(Exception ex){
+                ex.printStackTrace();
+            }
+        }
+
+
         if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
             String[] billCodeSortList = emisWaybill.getBillCode().split(",");
             if(billCodeSortList.length>1){
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 77a48ebfc..581480e20 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -1027,7 +1027,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         emisWaybillSave.setId(oldEmisWaybill.getId());
 
         // 公共计算部分
-        calcWayBillCommonInfo(emisWaybillSave,true);
+        calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,true);
 
         emisWaybillSave.preUpdate();
 
@@ -1514,7 +1514,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
      * @param isNew
      * @throws EmisBizError
      */
-    private void calcWayBillCommonInfo(EmisWaybill emisWaybillSave,boolean isNew) throws EmisBizError {
+    private void calcWayBillCommonInfo(EmisWaybill emisWaybillSave,EmisWaybill oldWaybil,boolean isNew) throws EmisBizError {
 
         String orderSn = WaybillHelper.genOrderSn();
 
@@ -2290,7 +2290,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         }
 
         // 公共计算部分
-        calcWayBillCommonInfo(emisWaybillSave,true);
+        calcWayBillCommonInfo(emisWaybillSave,null,true);
 
 
 
@@ -2551,7 +2551,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         // 公共计算部分
         emisWaybillSave.setId(oldEmisWaybill.getId());
 
-        calcWayBillCommonInfo(emisWaybillSave,false);
+        calcWayBillCommonInfo(emisWaybillSave,oldEmisWaybill,false);
 
         emisWaybillSave.preUpdate();