From b0cdcdcff5cbcba3e619f738249202cd68da5c7e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 27 Jul 2024 07:33:48 +0800
Subject: [PATCH] md

---
 .../erp/oms/web/Oms2cCommonController.java    | 20 -------------------
 .../erp/oms/web/Oms2cWaybillController.java   | 14 ++++++++++++-
 .../oms/mapper/EmisCustomerAddressMapper.java | 12 ++---------
 .../service/impl/EmisWaybillServiceImpl.java  |  2 +-
 .../erp/oms/service/svc/IRpcWaybillSvc.java   |  7 +++++++
 5 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
index 7d30ebb..d0efe8d 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
@@ -54,26 +54,6 @@ public class Oms2cCommonController extends BaseController
     }
 
 
-    /**
-     * 获取进仓单号
-     */
-    @RequestMapping(value = "/getWareHouseInNo")
-    public AjaxResult getWareHouseInNo()
-    {
-        try {
-            String YYMMDD = "yyMMdd";
-
-            String hbKey= "TAN-7080"+DateUtils.parseDateToStr(YYMMDD,new Date());
-            Long lockNo = redissonService.addAndGetLong(hbKey,1L);
-            String packNo =hbKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0");
-            return AjaxResult.success("获取成功",packNo);
-        }catch (Exception ex){
-            ex.printStackTrace();
-            return AjaxResult.error(ex.getMessage());
-        }
-    }
-
-
     /**
      * 获取解析地址
      */
diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index 89f941e..5a5e8b8 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -100,6 +100,18 @@ public class Oms2cWaybillController extends BaseController
         return this.iRpcWaybillSvc.realSubmitOrderByOms(waybillOrder,isModify);
     }
 
+    @Log(title = "客户取消订单", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/cancelOrder")
+    public AjaxResult cancelOrder(@Valid @RequestBody WaybillOrder waybillOrder)
+    {
+        waybillOrder.setUserId(getLoginUser().getUser().getId());
+        waybillOrder.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+        waybillOrder.setOrderSn(waybillOrder.getOrderSn());
+        waybillOrder.setOrderRemark(waybillOrder.getOrderRemark());
+        return this.iRpcWaybillSvc.cancelOrder(waybillOrder);
+    }
+
+
 
     @Log(title = "OMSExcel草稿方式下单", businessType = BusinessType.INSERT)
     @PostMapping(value = "/draftSubmitOrder")
@@ -223,7 +235,7 @@ public class Oms2cWaybillController extends BaseController
         if(CollectionUtil.isEmpty(empList)){
             return AjaxResult.error("业务员不存在");
         }
-        return AjaxResult.success("获取成功",emp);
+        return AjaxResult.success("获取成功",empList);
     }
 
 
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java
index f0609e2..0472388 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisCustomerAddressMapper.java
@@ -75,20 +75,12 @@ public interface EmisCustomerAddressMapper extends BaseMapper<EmisCustomerAddres
 
 
     /**
-     * 取消站点确认默认地址
-     * @param useSiteCode
+     * 取消默认
      * @return
      */
-    public int cancelUseSiteDefaultFlag(String useSiteCode);
+    public int cancelCustomerDefaultFlag(String customerCode);
 
 
-    /**
-     * 取消
-     * @param useSiteCode
-     * @return
-     */
-    public int cancelCustomerDefaultFlag(String useSiteCode);
-
 
     /**
      * 检查是否重复
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
index 4c62433..af47656 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
@@ -66,7 +66,7 @@ public class EmisWaybillServiceImpl  implements IEmisWaybillService
     }
 
     /**
-     * 查询订单列表列表
+     * 查询业务员
      *
      * @param searchValue 运单列表
      * @return 运单列表
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java
index 00d5106..5703f64 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWaybillSvc.java
@@ -31,6 +31,13 @@ public interface IRpcWaybillSvc {
     @PostMapping(value = "/apiweb/emisWaybill/realSubmitOrderByOms")
     public AjaxResult realSubmitOrderByOms(@RequestBody WaybillOrder waybillOrder,@RequestParam("isModify") Integer isModify);
 
+    /**
+     * OMS 取消下单
+     * @param waybillOrder
+     * @return
+     */
+    @PostMapping(value = "/apiweb/emisWaybill/cancelOrder")
+    public AjaxResult cancelOrder(@RequestBody WaybillOrder waybillOrder);
 
     /**
      * 获取运单详情