From 04754e1b6c387259b4068c492e86068e12bac522 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 27 May 2024 15:28:08 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 22 ++++++++++
 .../erp/emis/domain/vo/WaybillOrder.java      | 41 +++++++++++--------
 2 files changed, 45 insertions(+), 18 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 643a070f2..826fb600a 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
@@ -302,6 +302,28 @@ public class EmisWaybillController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询签收运单列表列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:list')")
+    @RequestMapping("/querySignlist")
+    public TableDataInfo querySignlist(EmisWaybill emisWaybill)
+    {
+        // 非总部只能查看自己的或者与自己相关的订单
+
+        startPage();
+
+        if(!(getLoginUser().getUser().isTopSite())){
+            emisWaybill.getParams().put("innerQuery","1");
+            emisWaybill.getParams().put("currentSiteCode",getLoginUser().getUser().getOwnerSiteCode());
+            emisWaybill.getParams().put("currentEmpCode",getLoginUser().getUser().getEmpCode());
+            emisWaybill.getParams().put("currentEmpName",getLoginUser().getUser().getEmpName());
+        }
+
+        List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
+        return getDataTable(list);
+    }
+
 
     @JacksonFilter(include= {
             "id","orderSn","billCode","orderStatus","waybillStatus",
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
index 8b2ef67c2..4be7b1aa1 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java
@@ -243,6 +243,11 @@ public class WaybillOrder  implements Serializable {
 
     private String remark;
 
+    /* 揽收图片备注 */
+    private String billPicSendRmk;
+    /* 签收底单图片 */
+    private String billPicDispatchRmk;
+
 
     /* 扩展信息 */
     /* 是否生成子单 1-是 0-否 */
@@ -481,24 +486,24 @@ public class WaybillOrder  implements Serializable {
 //        voItem.setInsureRemark(dbWaybill.getInsureRemark());
 //        voItem.setInsureSiteCode(dbWaybill.getInsureSiteCode());
 //        voItem.setInsureDate(dbWaybill.getInsureDate());
-//        voItem.setBlPrint(dbWaybill.getBlPrint());
-//        voItem.setPrintManCode(dbWaybill.getPrintManCode());
-//        voItem.setPrintSite(dbWaybill.getPrintSite());
-//        voItem.setPrintDate(dbWaybill.getPrintDate());
-//        voItem.setPrintCount(dbWaybill.getPrintCount());
+        voItem.setBlPrint(dbWaybill.getBlPrint());
+        voItem.setPrintManCode(dbWaybill.getPrintManCode());
+        voItem.setPrintSite(dbWaybill.getPrintSite());
+        voItem.setPrintDate(dbWaybill.getPrintDate());
+        voItem.setPrintCount(dbWaybill.getPrintCount());
 
         voItem.setBlDispFd(dbWaybill.getBlDispFd());
         voItem.setTransferCode(dbWaybill.getTransferCode());
         voItem.setTransferBillcode(dbWaybill.getTransferBillcode());
         voItem.setDispFdDate(dbWaybill.getDispFdDate());
+        voItem.setDispFdReason(dbWaybill.getDispFdReason());
 
-//        voItem.setDispFdReason(dbWaybill.getDispFdReason());
-//        voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode());
-//        voItem.setNextSiteCode(dbWaybill.getNextSiteCode());
-//        voItem.setLastSiteCode(dbWaybill.getLastSiteCode());
+        voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode());
+        voItem.setNextSiteCode(dbWaybill.getNextSiteCode());
+        voItem.setLastSiteCode(dbWaybill.getLastSiteCode());
         voItem.setRegisterSiteCode(dbWaybill.getRegisterSiteCode());
-//        voItem.setRegisterDate(dbWaybill.getRegisterDate());
-//        voItem.setRegisterManCode(dbWaybill.getRegisterManCode());
+        voItem.setRegisterDate(dbWaybill.getRegisterDate());
+        voItem.setRegisterManCode(dbWaybill.getRegisterManCode());
 
         voItem.setTakePieceEmployeeCode(dbWaybill.getTakePieceEmployeeCode());
         voItem.setSendSiteCode(dbWaybill.getSendSiteCode());
@@ -531,16 +536,16 @@ public class WaybillOrder  implements Serializable {
         voItem.setBlAcceptMessage(dbWaybill.getBlAcceptMessage());
 
         voItem.setBlGenSubbill(dbWaybill.getBlGenSubbill());
-//        voItem.setSignMan(dbWaybill.getSignMan());
-//        voItem.setSignManCode(dbWaybill.getSignManCode());
-//        voItem.setSignSiteCode(dbWaybill.getSignSiteCode());
-//        voItem.setSignDate(dbWaybill.getSignDate());
-//        voItem.setBillPicSendRmk(dbWaybill.getBillPicSendRmk());
-//        voItem.setBillPicDispatchRmk(dbWaybill.getBillPicDispatchRmk());
+        voItem.setSignMan(dbWaybill.getSignMan());
+        voItem.setSignManCode(dbWaybill.getSignManCode());
+        voItem.setSignSiteCode(dbWaybill.getSignSiteCode());
+        voItem.setSignDate(dbWaybill.getSignDate());
+        voItem.setBillPicSendRmk(dbWaybill.getBillPicSendRmk());
+        voItem.setBillPicDispatchRmk(dbWaybill.getBillPicDispatchRmk());
 //        voItem.setTimezoneOffset(dbWaybill.getTimezoneOffset());
 //        voItem.setDelFlag(dbWaybill.getDelFlag());
 //        voItem.setCreateBy(dbWaybill.getCreateBy());
-//        voItem.setCreateTime(dbWaybill.getCreateTime());
+        voItem.setCreateTime(dbWaybill.getCreateTime());
 //        voItem.setUpdateBy(dbWaybill.getUpdateBy());
 //        voItem.setUpdateTime(dbWaybill.getUpdateTime());
         voItem.setRemark(dbWaybill.getRemark());