From 8b5ec512eb5a4662a356bbe792c12f5f660b0703 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 28 May 2024 00:19:16 +0800
Subject: [PATCH] md

---
 .../web/emis/EmisElectronicPagApplyController.java | 14 ++++++++++----
 .../emis/service/IEmisElectronicPagService.java    |  2 +-
 .../service/impl/EmisElectronicPagServiceImpl.java |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
index 6485a5061..bf8e94338 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisElectronicPagApplyController.java
@@ -144,11 +144,16 @@ public class EmisElectronicPagApplyController extends BaseController
     @PreAuthorize("@ss.hasPermi('emis:emisElectronicPagApply:send')")
     @Log(title = "网点电子面单发放", businessType = BusinessType.UPDATE)
     @PutMapping("/sendByCenter")
-    public AjaxResult sendByCenter(String prefix,String matialCode,String useSiteCode,Integer applyNum)
+    public AjaxResult sendByCenter(@RequestBody EmisElectronicPagApply emisElectronicPagApply)
     {
         try {
+            String prefix=emisElectronicPagApply.getPrefix();
+            String matialCode=emisElectronicPagApply.getMaterialCode();
+            String useSiteCode=emisElectronicPagApply.getApplySiteCode();
+            Integer applyNum=emisElectronicPagApply.getApplyCount();
+            String remark=emisElectronicPagApply.getRemark();
 //            prefix="T7080";
-            return toAjax(emisElectronicPagService.sendByCenter(useSiteCode,matialCode,"T7080",applyNum));
+            return toAjax(emisElectronicPagService.sendByCenter(useSiteCode,matialCode,"T7080",applyNum,remark));
         }catch (Exception ex){
             ex.printStackTrace();
             // 返回子定义异常
@@ -165,13 +170,14 @@ public class EmisElectronicPagApplyController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('emis:emisElectronicPagApply:cancel')")
     @Log(title = "网点电子面单取消", businessType = BusinessType.UPDATE)
-    @PutMapping("/cancel")
-    public AjaxResult cancel(@RequestBody EmisElectronicPagApply emisElectronicPagApply)
+    @PutMapping("/cancelApply")
+    public AjaxResult cancelApply(@RequestBody EmisElectronicPagApply emisElectronicPagApply)
     {
         emisElectronicPagApply.setCancelDate(new Date());
         emisElectronicPagApply.setCancelManCode(getLoginUser().getUser().getEmpCode());
         emisElectronicPagApply.setCancelSiteCode(getLoginUser().getUser().getOwnerSiteCode());
         emisElectronicPagApply.setBlCancel("1");
+        emisElectronicPagApply.preUpdate();
 
         return toAjax(emisElectronicPagApplyService.updateEmisElectronicPagApply(emisElectronicPagApply));
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
index 511d9ddf2..0106df8d5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
@@ -47,7 +47,7 @@ public interface IEmisElectronicPagService
      * @return
      * @throws EmisBizError
      */
-    public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum) throws EmisBizError;
+    public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum,String remark) throws EmisBizError;
 
  /**
      * 查询电子面单列表
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
index 41bda864a..2a4dd7157 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisElectronicPagServiceImpl.java
@@ -185,7 +185,7 @@ public class EmisElectronicPagServiceImpl extends EmisBaseService implements IEm
      */
     @Transactional
     @Override
-    public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum) throws EmisBizError {
+    public int sendByCenter(String applySiteCode,String materialCode,String prefix,Integer applyNum,String remark) throws EmisBizError {
 
         // 生成流水号
         String nowStr=DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS,new Date());