Merge remote-tracking branch 'origin/dev' into dev

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

@@ -46,16 +46,13 @@ public class KHUpdateOrderMessage {
     @PostMapping("/waybillChanges")
     public AjaxResult waybillChanges(@RequestParam(value = "tWarehousebills") String tWarehousebills,
                                               @RequestParam(value = "tWarehousebillsCntr",required = false) String tWarehousebillsCntr,
-                                              @RequestParam(value = "tWarehousebillsCntritems",required = false) String tWarehousebillsCntritems,
-                                              @RequestParam(value = "tWarehousebillsfeesCr",required = false) String tWarehousebillsfeesCr,
-                                              @RequestParam(value = "tWarehousebillsfeesDr",required = false) String tWarehousebillsfeesDr){
+                                              @RequestParam(value = "tWarehousebillsCntritems",required = false) String tWarehousebillsCntritems){
         if (StringUtils.isEmpty(tWarehousebills)){
             return AjaxResult.error("未找到订单主表信息,请确认");
         }
         String billsType = "KHDD";
         LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        return tWarehousebillsService.waybillChanges(tWarehousebills,tWarehousebillsCntr,tWarehousebillsCntritems,
-                tWarehousebillsfeesCr,tWarehousebillsfeesDr,loginUser,billsType);
+        return tWarehousebillsService.waybillChanges(tWarehousebills,tWarehousebillsCntr,tWarehousebillsCntritems, loginUser,billsType);
 
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/basicData/service/impl/TFeesServiceImpl.java

@@ -72,6 +72,7 @@ public class TFeesServiceImpl implements ITFeesService {
      * @return 结果
      */
     @Override
+    @Transactional
     public AjaxResult updateTFees(TFees tFees) {
         String modify = tFeesMapper.selectTFeesModify(tFees);
         if ("F".equals(modify)) {

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

@@ -501,12 +501,10 @@ public interface ITWarehouseBillsService {
      * 凯和商务端运单变更
      * @param tWarehousebills
      * @param tWarehousebillsCntritems
-     * @param tWarehousebillsfeesCr
-     * @param tWarehousebillsfeesDr
      * @return
      */
     public AjaxResult waybillChanges(String tWarehousebills,String tWarehousebillsCntr,String tWarehousebillsCntritems,
-                                              String tWarehousebillsfeesCr,String tWarehousebillsfeesDr,LoginUser loginUser,
+                                              LoginUser loginUser,
                                               String billsType);
 
     /**

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

@@ -2712,13 +2712,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         warehouseBills.setUpdateBy(SecurityUtils.getUsername());
         Long timestamp = DateUtils.getTimestamp(new Date());
         warehouseBills.setfDateChanged(timestamp.toString() + (int) (Math.random() * 900) + 100);
-        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
-        warehouseBills.setfQty(itemInFo.getfQty());
-        warehouseBills.setfNetweight(itemInFo.getfNetweight());
-        warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
-        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         // 查询最新明细表
         TWarehousebillsitems warehousebillsitems = tWarehousebillsitemsMapper.selectTWarehousebillsitemsById(tWarehousebillsitems.getfId());
+        Date time = new Date();
+        if (StringUtils.isNotEmpty(warehouseBills.getfChargetype()) && "0".equals(warehouseBills.getfChargetype())) {
+            time = tWarehousebillsitemsMapper.selecMinBsDateByFPid(tWarehousebillsitems.getfPid());
+        }else if (StringUtils.isNotEmpty(warehouseBills.getfChargetype()) && "1".equals(warehouseBills.getfChargetype())){
+            time = warehousebillsitems.getfBsdate();
+        }
+        tWarehousebillsitems.setfChargedate(time);
         if (StringUtils.isNull(warehousebillsitems) || warehousebillsitems.getfBillstatus() != 30L) {
             return AjaxResult.error("请确认是该明细数据是否存在，或该明细数据状态异常");
         }
@@ -2745,6 +2747,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 warehousebillsitems.setfQty(tWarehousebillsitems.getfQty());
                 warehousebillsitems.setfGrossweight(tWarehousebillsitems.getfGrossweight());
                 warehousebillsitems.setfNetweight(tWarehousebillsitems.getfNetweight());
+                warehousebillsitems.setfStevedore(tWarehousebillsitems.getfStevedore());
+                warehousebillsitems.setRemark(tWarehousebillsitems.getRemark());
+                warehousebillsitems.setfWarehouselocid(tWarehousebillsitems.getfWarehouselocid());
                 if (instalTWhgenleg(warehouseBills, warehousebillsitems, loginUser.getUser()) <= 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return AjaxResult.error("新增库存总账失败");
@@ -2799,6 +2804,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tEnclosureMapper.insertTEnclosure(enclosure);
             }
         }
+        TWarehousebillsitems itemInFo = tWarehousebillsitemsMapper.selectItemQtyByFPid(warehouseBills.getfId());
+        warehouseBills.setfQty(itemInFo.getfQty());
+        warehouseBills.setfNetweight(itemInFo.getfNetweight());
+        warehouseBills.setfGrossweight(itemInFo.getfGrossweight());
+        tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
         return AjaxResult.success();
     }
 
@@ -4894,13 +4904,22 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             }
             return approvalFlow;
+        }else {
+            TWarehouseBills tWarehousebillsById = tWarehouseBillsMapper.selectTWarehousebillsById(fPid);
+            if (tWarehousebillsById.getfSubmitUpdate().longValue() == 6L){
+                TWarehouseBills bills = new TWarehouseBills();
+                bills.setfId(tWarehousebillsById.getfId());
+                bills.setfSubmitUpdate(2L);
+                bills.setfUpdeteStatus(2L);
+                tWarehouseBillsMapper.updateKaHeOrder(bills);
+            }
         }
         return AjaxResult.success();
     }
 
     @Override
     @Transactional
-    public AjaxResult waybillChanges(String tWarehousebills, String tWarehousebillsCntr, String tWarehousebillsCntritems, String tWarehousebillsfeesCr, String tWarehousebillsfeesDr, LoginUser loginUser, String billsType) {
+    public AjaxResult waybillChanges(String tWarehousebills, String tWarehousebillsCntr, String tWarehousebillsCntritems, LoginUser loginUser, String billsType) {
         Date date = new Date();//修改时间
         String userName = loginUser.getUser().getUserName();//修改人
         //修改主表信息
@@ -4927,6 +4946,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntr);
             List<TWarehousebillsCntr> tWarehousebillsCntrList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntr.class);
             for (TWarehousebillsCntr warehousebillsCntr : tWarehousebillsCntrList) {
+                if(warehousebillsCntr.getfId() == null){
+                    warehousebillsCntr.setfPid(warehouseBills.getfId());
+                }
                 if (warehousebillsCntr.getCreateTime() == null){
                     warehousebillsCntr.setCreateTime(date);
                 }else {
@@ -4946,6 +4968,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             JSONArray objects = JSONArray.parseArray(tWarehousebillsCntritems);
             List<TWarehousebillsCntritems> tWarehousebillsCntritemsList = JSONObject.parseArray(objects.toJSONString(), TWarehousebillsCntritems.class);
             for (TWarehousebillsCntritems warehousebillsCntritems : tWarehousebillsCntritemsList) {
+                if(warehousebillsCntritems.getfId() == null){
+                    warehousebillsCntritems.setfPid(warehouseBills.getfId());
+                }
                 if (warehousebillsCntritems.getCreateTime() == null){
                     warehousebillsCntritems.setCreateTime(date);
                 }else {
@@ -4959,44 +4984,6 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehousebillsCntritemsMapper.insertTWarehousebillsCntritems(warehousebillsCntritems);
             }
         }
-        //修改付费信息
-        if (StringUtils.isNotEmpty(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)){
-            tWarehousebillsfeesMapper.deleteFessByFPid(warehouseBills.getfId(),"C");
-            JSONArray jsonArray = JSONArray.parseArray(tWarehousebillsfeesCr);
-            List<TWarehousebillsfees> warehousebillsfeesCrList = JSONObject.parseArray(jsonArray.toJSONString(), TWarehousebillsfees.class);
-            for (TWarehousebillsfees tWarehousebillsfees : warehousebillsfeesCrList) {
-                if (tWarehousebillsfees.getCreateTime() == null){
-                    tWarehousebillsfees.setCreateTime(date);
-                }else {
-                    tWarehousebillsfees.setUpdateTime(date);
-                }
-                if (StringUtils.isNull(tWarehousebillsfees.getCreateBy())){
-                    tWarehousebillsfees.setCreateBy(userName);
-                }else {
-                    tWarehousebillsfees.setUpdateBy(userName);
-                }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(tWarehousebillsfees);
-            }
-        }
-        //修改收费费信息
-        if (StringUtils.isNotEmpty(tWarehousebillsCntritems) && !"[]".equals(tWarehousebillsCntritems)){
-            tWarehousebillsfeesMapper.deleteFessByFPid(warehouseBills.getfId(),"D");
-            JSONArray parseArray = JSONArray.parseArray(tWarehousebillsfeesDr);
-            List<TWarehousebillsfees> warehousebillsfeesDrList = JSONObject.parseArray(parseArray.toJSONString(), TWarehousebillsfees.class);
-            for (TWarehousebillsfees tWarehousebillsfees : warehousebillsfeesDrList) {
-                if (tWarehousebillsfees.getCreateTime() == null){
-                    tWarehousebillsfees.setCreateTime(date);
-                }else {
-                    tWarehousebillsfees.setUpdateTime(date);
-                }
-                if (StringUtils.isNull(tWarehousebillsfees.getCreateBy())){
-                    tWarehousebillsfees.setCreateBy(userName);
-                }else {
-                    tWarehousebillsfees.setUpdateBy(userName);
-                }
-                tWarehousebillsfeesMapper.insertTWarehousebillsfees(tWarehousebillsfees);
-            }
-        }
         return AjaxResult.success();
     }
 

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehousebillsMapper.xml

@@ -1660,29 +1660,29 @@
         WHEN tw.f_billstatus = '12' and tw.f_updete_status = '2'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
         '运单变更'
         WHEN  tw.f_updete_status = '3'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改驳回'
+        '申请变更驳回'
         WHEN  tw.f_updete_status = '4'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改提交'
+        '申请变更提交'
         WHEN  tw.f_updete_status = '5'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改审批中'
+        '申请变更审批中'
         WHEN  tw.f_updete_status = '6'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改通过'
+        '申请变更通过'
         WHEN  tw.f_submit_update = '3' and tw.f_delete_status = '2' THEN
-        '修改提交驳回'
+        '提交变更驳回'
         WHEN  tw.f_submit_update = '4' and tw.f_delete_status = '2' THEN
-        '修改提交审批'
+        '提交变更审批'
         WHEN  tw.f_submit_update = '5' and tw.f_delete_status = '2' THEN
-        '修改提交审批中'
+        '提交变更审批中'
         WHEN  tw.f_submit_update = '6' and tw.f_delete_status = '2' THEN
-        '修改提交通过'
+        '提交变更通过'
         WHEN  tw.f_delete_status = '3' THEN
-        '运单删除驳回'
+        '申请删单驳回'
         WHEN  tw.f_delete_status = '4' THEN
-        '运单删除提交'
+        '申请删单提交'
         WHEN  tw.f_delete_status = '5' THEN
-        '运单删除审批中'
+        '申请删单审批中'
         WHEN  tw.f_delete_status = '6' THEN
-        '运单删除通过'
+        '申请删单通过'
         END AS fBillstatus,
         CASE
         WHEN tf.f_billstatus = '1' THEN
@@ -1768,7 +1768,28 @@
             <if test="fIfdamage != null  and fIfdamage != ''">and tw.f_ifdamage = #{fIfdamage}</if>
             <if test="fBankcorpid != null  and fBankcorpid != ''">and tw.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null  and fBilltype != ''">and tw.f_billtype = #{fBilltype}</if>
-            <if test="fBillstatus != null ">and tw.f_billstatus = #{fBillstatus}</if>
+            <if test="fBillstatus == null">
+                and tw.f_updete_status = 2
+                and tw.f_submit_update = 2
+                and tw.f_delete_status = 2
+            </if>
+            <if test="fBillstatus != null and (fBillstatus == 4 or fBillstatus == 6 or fBillstatus == 9 or fBillstatus == 11)">
+                and tw.f_billstatus = #{fBillstatus}
+                and tw.f_updete_status = 2
+                and tw.f_submit_update = 2
+                and tw.f_delete_status = 2
+            </if>
+            <if test="fBillstatus != null and fBillstatus == 10">
+                and tw.f_billstatus in ('3','8')
+                and tw.f_updete_status in ('2','3')
+                and tw.f_submit_update in ('2','3')
+                and tw.f_delete_status in ('2','3')
+            </if>
+            <if test="fBillstatus != null and fBillstatus == 12">
+                AND (tw.f_updete_status != 2
+                OR tw.f_submit_update != 2
+                OR tw.f_delete_status != 2 )
+            </if>
             <if test="fItemsStatus != null ">and tw.f_items_status = #{fItemsStatus}</if>
             <if test="fBillingDeadline != null ">and tw.f_billing_deadline = #{fBillingDeadline}</if>
             <if test="fProductName != null  and fProductName != ''">and tw.f_product_name like concat('%',
@@ -1892,29 +1913,29 @@
         WHEN tw.f_billstatus = '12' and tw.f_updete_status = '2'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
         '运单变更'
         WHEN  tw.f_updete_status = '3'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改驳回'
+        '申请变更驳回'
         WHEN  tw.f_updete_status = '4'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改提交'
+        '申请变更提交'
         WHEN  tw.f_updete_status = '5'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改审批中'
+        '申请变更审批中'
         WHEN  tw.f_updete_status = '6'and tw.f_submit_update = '2' and tw.f_delete_status = '2' THEN
-        '运单修改通过'
+        '申请变更通过'
         WHEN  tw.f_submit_update = '3' and tw.f_delete_status = '2' THEN
-        '修改提交驳回'
+        '提交变更驳回'
         WHEN  tw.f_submit_update = '4' and tw.f_delete_status = '2' THEN
-        '修改提交审批'
+        '提交变更审批'
         WHEN  tw.f_submit_update = '5' and tw.f_delete_status = '2' THEN
-        '修改提交审批中'
+        '提交变更审批中'
         WHEN  tw.f_submit_update = '6' and tw.f_delete_status = '2' THEN
-        '修改提交通过'
+        '提交变更通过'
         WHEN  tw.f_delete_status = '3' THEN
-        '运单删除驳回'
+        '申请删单驳回'
         WHEN  tw.f_delete_status = '4' THEN
-        '运单删除提交'
+        '申请删单提交'
         WHEN  tw.f_delete_status = '5' THEN
-        '运单删除审批中'
+        '申请删单审批中'
         WHEN  tw.f_delete_status = '6' THEN
-        '运单删除通过'
+        '申请删单通过'
         END AS fBillstatusName,
         CASE
         WHEN tf.f_billstatus = '1' THEN
@@ -2000,7 +2021,28 @@
             <if test="fIfdamage != null  and fIfdamage != ''">and tw.f_ifdamage = #{fIfdamage}</if>
             <if test="fBankcorpid != null  and fBankcorpid != ''">and tw.f_bankcorpid = #{fBankcorpid}</if>
             <if test="fBilltype != null  and fBilltype != ''">and tw.f_billtype = #{fBilltype}</if>
-            <if test="fBillstatus != null ">and tw.f_billstatus = #{fBillstatus}</if>
+            <if test="fBillstatus == null">
+            and tw.f_updete_status = 2
+            and tw.f_submit_update = 2
+            and tw.f_delete_status = 2
+            </if>
+            <if test="fBillstatus != null and (fBillstatus == 4 or fBillstatus == 6 or fBillstatus == 9 or fBillstatus == 11)">
+                and tw.f_billstatus = #{fBillstatus}
+                and tw.f_updete_status = 2
+                and tw.f_submit_update = 2
+                and tw.f_delete_status = 2
+            </if>
+            <if test="fBillstatus != null and fBillstatus == 10">
+                and tw.f_billstatus in ('3','8')
+                and tw.f_updete_status in ('2','3')
+                and tw.f_submit_update in ('2','3')
+                and tw.f_delete_status in ('2','3')
+            </if>
+            <if test="fBillstatus != null and fBillstatus == 12">
+                AND (tw.f_updete_status != 2
+                OR tw.f_submit_update != 2
+                OR tw.f_delete_status != 2 )
+            </if>
             <if test="fItemsStatus != null ">and tw.f_items_status = #{fItemsStatus}</if>
             <if test="fBillingDeadline != null ">and tw.f_billing_deadline = #{fBillingDeadline}</if>
             <if test="fProductName != null  and fProductName != ''">and tw.f_product_name like concat('%',
@@ -2222,7 +2264,8 @@
             w.f_planvolumn fPlanvolumn,
             w.f_plannetweight fPlannetweight,
             w.f_plangrossweight fPlangrossweight,
-            w.f_grossweight fGrossweight,
+            IFNULL(ROUND(w.f_grossweight/1000.3465,2),0) fGrossweight,
+            w.f_grossweight fGrossweights,
             w.f_storekeeper fStorekeeper,
             w.create_by createBy,
             w.f_warehouseid fWarehouseid,
@@ -2317,7 +2360,8 @@
             cntr.f_name cntrtypes,
             t.f_cntrtype fCntrtype,
             t.f_qty fQty,
-            t.f_grossweight fGrossweight,
+            IFNULL(ROUND(w.f_grossweight/1000.3465,2),0) fGrossweight,
+            t.f_grossweight fGrossweights,
             t.f_cntqty fCntqty,
         CASE
 		    WHEN t.f_billstatus = '10' THEN