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

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

@@ -0,0 +1,46 @@
+package com.ruoyi.web.controller.shipping.controller;
+
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
+import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/splitsingle/updateWareSign")
+public class TSignController extends BaseController {
+
+    //主表service
+    @Autowired
+    private ITWarehouseBillsService tWarehousebillsService;
+
+    /**
+     * 旧单的id与新单的所有的信息，拆成两份，旧单的箱量为原数量减去新单的数量
+     * @param tWarehousebills            仓库出入表
+     * @param tWarehousebillsCntr        订单从表
+     * @param tWarehousebillsCntritems   箱明细表
+     * @return
+     */
+    @PostMapping("/wareChaiSign")
+    public AjaxResult updateSignChai(@RequestParam String tWarehousebills,
+                                     @RequestParam String tWarehousebillsCntr,
+                                     @RequestParam String tWarehousebillsCntritems,
+                                     @RequestParam("fOriginalbillno") String fOriginalbillno) {
+        if (StringUtils.isEmpty(tWarehousebills)){
+            return AjaxResult.error("未找到订单主表信息,请确认");
+        }
+        if (StringUtils.isEmpty(tWarehousebillsCntr)){
+            return AjaxResult.error("未找到订单从表信息,请确认");
+        }
+        if (StringUtils.isEmpty(tWarehousebillsCntritems)){
+            return AjaxResult.error("未找到箱明细表信息,请确认");
+        }
+        //旧单可以拆，新单不可以拆，拆出的新单的箱数
+        return tWarehousebillsService.updateMessageSign(tWarehousebills,tWarehousebillsCntr,tWarehousebillsCntritems,fOriginalbillno);
+    }
+
+}

ruoyi-shipping/src/main/java/com/ruoyi/shipping/mapper/TWarehousebillsCntritemsMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.shipping.domain.TWarehousebillsCntritems;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 凯和箱明细Mapper接口
@@ -88,4 +89,13 @@ public interface TWarehousebillsCntritemsMapper
      * @return
      */
     public List<Map<String,Object>>bookingSpace();
+    /**
+     * 删除旧单箱信息
+     *
+     * @param fPid 凯和箱明细ID
+     * @param fCntrno 箱号
+     * @return 结果
+     */
+    public int deleteTWarehousebillsCntritemOlder(@Param("fPid") Long fPid,
+                                                  @Param("fCntrno") String fCntrno);
 }

ruoyi-shipping/src/main/resources/mapper/shipping/TWarehousebillsCntritemsMapper.xml

@@ -242,5 +242,8 @@ FROM
 	ORDER BY CONVERT(tp.f_name USING gbk) asc
 	LIMIT 10
     </select>
+    <delete id="deleteTWarehousebillsCntritemOlder" parameterType="object">
+        delete from t_warehousebills_cntritems where f_pid = #{fPid} and f_cntrno = #{fCntrno}
+    </delete>
     
 </mapper>

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

@@ -558,4 +558,13 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult updateBoxMessage(TCntrnoMessage tCntrno, LoginUser loginUser);
+
+    /**
+     * 凯和拆单
+     * @param tWarehousebills
+     * @param tWarehousebillsCntr
+     * @param tWarehousebillsCntritems
+     * @return
+     */
+    public AjaxResult updateMessageSign(String tWarehousebills,String tWarehousebillsCntr,String tWarehousebillsCntritems,String fOriginalbillno);
 }