凯和修改订单

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHTWarehousebillsController.java

@@ -283,6 +283,7 @@ public class KHTWarehousebillsController extends BaseController
     //@Log(title = "凯和若依订单维护", businessType = BusinessType.DELETE)
     @PostMapping("/ruoYiUpdateOrderMessage")
     public AjaxResult ruoYiUpdateOrderMessage(@RequestParam(value = "tWarehousebills") String tWarehousebills,
+                                              @RequestParam(value = "tWarehousebillsCntr",required = false) String tWarehousebillsCntr,
                                                 @RequestParam(value = "tWarehousebillsCntritems",required = false) String tWarehousebillsCntritems,
                                                           @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                                               @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr){
@@ -291,7 +292,7 @@ public class KHTWarehousebillsController extends BaseController
         }
         String billsType = "KHDD";
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehousebillsService.ruoYiUpdateOrderMessage(tWarehousebills,tWarehousebillsCntritems,
+        return tWarehousebillsService.ruoYiUpdateOrderMessage(tWarehousebills,tWarehousebillsCntr,tWarehousebillsCntritems,
                 tWarehousebillsfeesCr,tWarehousebillsfeesDr,loginUser,billsType);
 
     }
@@ -308,6 +309,7 @@ public class KHTWarehousebillsController extends BaseController
     //@Log(title = "凯和若依订单提交", businessType = BusinessType.DELETE)
     @PostMapping("/ruoYiSubmitMessage")
     public AjaxResult ruoYiSubmitMessage(@RequestParam(value = "tWarehousebills") String tWarehousebills,
+                                         @RequestParam(value = "tWarehousebillsCntr",required = false) String tWarehousebillsCntr,
                                               @RequestParam(value = "tWarehousebillsCntritems",required = false) String tWarehousebillsCntritems,
                                               @RequestParam("tWarehousebillsfeesCr") String tWarehousebillsfeesCr,
                                               @RequestParam("tWarehousebillsfeesDr") String tWarehousebillsfeesDr){
@@ -316,7 +318,7 @@ public class KHTWarehousebillsController extends BaseController
         }
         String billsType = "KHDD";
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehousebillsService.ruoYiSubmitMessage(tWarehousebills,tWarehousebillsCntritems,
+        return tWarehousebillsService.ruoYiSubmitMessage(tWarehousebills,tWarehousebillsCntr,tWarehousebillsCntritems,
                 tWarehousebillsfeesCr,tWarehousebillsfeesDr,loginUser,billsType);
 
     }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -313,7 +313,7 @@ public interface ITWarehouseBillsService {
      * @param tWarehousebillsfeesDr
      * @return
      */
-    public AjaxResult ruoYiUpdateOrderMessage(String tWarehousebills,String tWarehousebillsCntritems,
+    public AjaxResult ruoYiUpdateOrderMessage(String tWarehousebills,String tWarehousebillsCntr,String tWarehousebillsCntritems,
                                               String tWarehousebillsfeesCr,String tWarehousebillsfeesDr,LoginUser loginUser,
                                               String billsType);
     /**
@@ -324,7 +324,7 @@ public interface ITWarehouseBillsService {
      * @param tWarehousebillsfeesDr
      * @return
      */
-    public AjaxResult ruoYiSubmitMessage(String tWarehousebills,String tWarehousebillsCntritems,
+    public AjaxResult ruoYiSubmitMessage(String tWarehousebills,String tWarehousebillsCntr,String tWarehousebillsCntritems,
                                               String tWarehousebillsfeesCr,String tWarehousebillsfeesDr,LoginUser loginUser,
                                               String billsType);
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -1886,7 +1886,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
     @Override
     @Transactional
-    public AjaxResult ruoYiUpdateOrderMessage(String tWarehousebills, String tWarehousebillsCntritems, String tWarehousebillsfeesCr,
+    public AjaxResult ruoYiUpdateOrderMessage(String tWarehousebills,String tWarehousebillsCntr, String tWarehousebillsCntritems, String tWarehousebillsfeesCr,
                                               String tWarehousebillsfeesDr, LoginUser loginUser, String billsType) {
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehousebills, TWarehouseBills.class);
         Map<String, Object> map = new HashMap<>();
@@ -1902,14 +1902,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("订单未审核完成，暂不支持维护提单号");
         }
         TWarehouseBills bills = new TWarehouseBills();
-        bills.setfId(warehouseBills.getfId());
-        bills.setfMblno(warehouseBills.getfMblno());
-        Integer integer = tWarehouseBillsMapper.updateTWarehousebills(bills);
+        /*bills.setfId(warehouseBills.getfId());
+        bills.setfMblno(warehouseBills.getfMblno());*/
+        Integer integer = tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         if (integer <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("维护提单号失败,请联系管理员");
         }
-        List<TWarehouseBills> warehouseBillsList = tWarehouseBillsMapper.webVersionOrderById(bills);
+        List<TWarehouseBills> warehouseBillsList = tWarehouseBillsMapper.webVersionOrderById(warehouseBills);
         map.put("tWarehouseBills", warehouseBillsList.get(0));
         if (StringUtils.isNotEmpty(tWarehousebillsCntritems)) {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
@@ -1980,12 +1980,26 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             map.put("warehousebillsfeesDrList", warehousebillsfeesDrList);
         }
+        if (StringUtils.isNotEmpty(tWarehousebillsCntr) && !"[]".equals(tWarehousebillsCntr)){
+            JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntr.class);
+            if (CollectionUtils.isNotEmpty(tWarehousebillsCntrList)) {
+                int i = tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(warehouseBills.getfId());
+                for (TWarehousebillsCntr warehousebillsCntr : tWarehousebillsCntrList) {
+                    warehousebillsCntr.setfPid(warehouseBills.getfId());
+                    warehousebillsCntr.setCreateTime(DateUtils.getNowDate());
+                    warehousebillsCntr.setCreateBy(SecurityUtils.getUsername());
+                    int cntr = tWarehousebillsCntrMapper.insertTWarehousebillsCntr(warehousebillsCntr);
+                }
+            }
+            map.put("tWarehousebillsCntrList", tWarehousebillsCntrList);
+        }
         return AjaxResult.success("success", map);
     }
 
     @Override
     @Transactional
-    public AjaxResult ruoYiSubmitMessage(String tWarehousebills, String tWarehousebillsCntritems, String tWarehousebillsfeesCr,
+    public AjaxResult ruoYiSubmitMessage(String tWarehousebills,String tWarehousebillsCntr, String tWarehousebillsCntritems, String tWarehousebillsfeesCr,
                                          String tWarehousebillsfeesDr, LoginUser loginUser, String billsType) {
         boolean isApprove = false;
         String key = "";
@@ -2021,10 +2035,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if (tWarehouseBills.getfBillstatus() != 11L) {
             return AjaxResult.error("订单未审核完成，暂不支持维护提单号");
         }
-        TWarehouseBills bills = new TWarehouseBills();
+        /*TWarehouseBills bills = new TWarehouseBills();
         bills.setfId(warehouseBills.getfId());
-        bills.setfMblno(warehouseBills.getfMblno());
-        Integer integer = tWarehouseBillsMapper.updateTWarehousebills(bills);
+        bills.setfMblno(warehouseBills.getfMblno());*/
+        Integer integer = tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         map.put("tWarehouseBills", tWarehouseBills);
         if (StringUtils.isNotEmpty(tWarehousebillsCntritems)) {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
@@ -2083,6 +2097,20 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             map.put("warehousebillsfeesDrList", warehousebillsfeesDrList);
         }
+        if (StringUtils.isNotEmpty(tWarehousebillsCntr) && !"[]".equals(tWarehousebillsCntr)){
+            JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntr);
+            List<TWarehousebillsCntr> tWarehousebillsCntrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntr.class);
+            if (CollectionUtils.isNotEmpty(tWarehousebillsCntrList)) {
+                int i = tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(warehouseBills.getfId());
+                for (TWarehousebillsCntr warehousebillsCntr : tWarehousebillsCntrList) {
+                    warehousebillsCntr.setfPid(warehouseBills.getfId());
+                    warehousebillsCntr.setCreateTime(DateUtils.getNowDate());
+                    warehousebillsCntr.setCreateBy(SecurityUtils.getUsername());
+                    int cntr = tWarehousebillsCntrMapper.insertTWarehousebillsCntr(warehousebillsCntr);
+                }
+            }
+            map.put("tWarehousebillsCntrList", tWarehousebillsCntrList);
+        }
         if (isApprove) {
             AuditItems auditItems = new AuditItems();
             auditItems.setLevelId(0L);