凯和配船修改船名航次，取消配船功能

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

@@ -412,7 +412,11 @@ public class KHTWarehousebillsController extends BaseController
         if (tWarehousebills.getfVoyid() == null){
             return AjaxResult.error("请选择要修改为那个航次");
         }
-        return tWarehousebillsService.batchModifyingVesselVoyage(tWarehousebills.getOrderId(),tWarehousebills.getfVslid(),tWarehousebills.getfVoyid());
+        if (tWarehousebills.getfCargoPlanning() != null){
+            return tWarehousebillsService.batchModifyingVesselVoyage(tWarehousebills.getOrderId(),tWarehousebills.getfVslid(),tWarehousebills.getfVoyid(),tWarehousebills.getfCargoPlanning());
+        }else {
+            return tWarehousebillsService.batchModifyingVesselVoyage(tWarehousebills.getOrderId(),tWarehousebills.getfVslid(),tWarehousebills.getfVoyid(),null);
+        }
     }
 
     /**
@@ -423,6 +427,6 @@ public class KHTWarehousebillsController extends BaseController
      */
     @PostMapping("/cargoPlanning")
     public AjaxResult cargoPlanning(@RequestBody TWarehouseBills tWarehousebills){
-        return toAjax(tWarehousebillsService.updateKaHeOrder(tWarehousebills));
+        return tWarehousebillsService.batchModifyingVesselVoyage(tWarehousebills.getOrderId(),null,null,1L);
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/domain/TWarehouseBills.java

@@ -560,7 +560,7 @@ public class TWarehouseBills extends BaseEntity {
     private String fRemarksFees;
     /** 是否配船(0 是 1 否) */
     @Excel(name = "是否配船(0 是 1 否)")
-    private Integer fCargoPlanning;
+    private Long fCargoPlanning;
 
     /** 仓储费计费类型 */
     @Excel(name = "仓储费计费类型")
@@ -674,11 +674,11 @@ public class TWarehouseBills extends BaseEntity {
     //凯和订单ID
     private Long[] orderId;
 
-    public Integer getfCargoPlanning() {
+    public Long getfCargoPlanning() {
         return fCargoPlanning;
     }
 
-    public void setfCargoPlanning(Integer fCargoPlanning) {
+    public void setfCargoPlanning(Long fCargoPlanning) {
         this.fCargoPlanning = fCargoPlanning;
     }
 

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseBillsMapper.java

@@ -216,11 +216,13 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      * @param fIds 订单ID
      * @param fVessel 船名
      * @param fVoyage 航次
+     * @param fCargoPlanning 是否配船
      * @return
      */
     public int updateTWarehousebillsByIds(@Param("fIds") Long[] fIds,
                                           @Param("fVessel") Long fVessel,
-                                          @Param("fVoyage") Long fVoyage);
+                                          @Param("fVoyage") Long fVoyage,
+                                          @Param("fCargoPlanning") Long fCargoPlanning);
 
     /**
      * 凯和单航次配船

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

@@ -537,7 +537,7 @@ public interface ITWarehouseBillsService {
      * @param fVoyage 航次
      * @return
      */
-    public AjaxResult batchModifyingVesselVoyage(Long[] fIds,Long fVessel,Long fVoyage);
+    public AjaxResult batchModifyingVesselVoyage(Long[] fIds,Long fVessel,Long fVoyage,Long fCargoPlanning);
     /**
      * 凯和修改订单信息
      *

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

@@ -5278,15 +5278,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
     @Override
     @Transactional
-    public AjaxResult batchModifyingVesselVoyage(Long[] fIds, Long fVessel, Long fVoyage) {
+    public AjaxResult batchModifyingVesselVoyage(Long[] fIds, Long fVessel, Long fVoyage,Long fCargoPlanning) {
         //先查要改的多个订单的船名航次是否一直
-        List<TWarehouseBills> tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsByIds(fIds);
-        ArrayList<TWarehouseBills> collect = tWarehouseBills.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TWarehouseBills -> TWarehouseBills.getfVslid() + ";"+ TWarehouseBills.getfVoyid()))), ArrayList::new));
-        if (collect.size()>1){
-            return AjaxResult.error("请选择相同的船名航次");
+        if (fVessel != null && fVoyage != null){
+            List<TWarehouseBills> tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsByIds(fIds);
+            ArrayList<TWarehouseBills> collect = tWarehouseBills.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(TWarehouseBills -> TWarehouseBills.getfVslid() + ";"+ TWarehouseBills.getfVoyid()))), ArrayList::new));
+            if (collect.size()>1){
+                return AjaxResult.error("请选择相同的船名航次");
+            }
         }
         //一致批量更改船名航次
-        int i = tWarehouseBillsMapper.updateTWarehousebillsByIds(fIds, fVessel, fVoyage);
+        int i = tWarehouseBillsMapper.updateTWarehousebillsByIds(fIds, fVessel, fVoyage,fCargoPlanning);
         if (i>= 1){
             return AjaxResult.success();
         }else {

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

@@ -2536,7 +2536,7 @@
     </select>
     <select id="selectTWarehousebillsByIds" parameterType="String" resultMap="TWarehousebillsResult">
         select f_id,f_vslid, f_voyid from t_warehousebills
-        where f_id =
+        where f_id in
         <foreach item="fId" collection="array" open="(" separator="," close=")">
             #{fId}
         </foreach>
@@ -2544,11 +2544,13 @@
     <update id="updateTWarehousebillsByIds">
         update
         t_warehousebills
-        SET
-        f_vslid = #{fVslid},
-        f_voyid = #{fVoyid}
-        where f_id =
-        <foreach item="fId" collection="array" open="(" separator="," close=")">
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fVessel != null">f_vslid = #{fVessel},</if>
+            <if test="fVoyage != null">f_voyid = #{fVoyage},</if>
+            <if test="fCargoPlanning != null">f_cargo_planning = #{fCargoPlanning},</if>
+        </trim>
+        where f_id in
+        <foreach item="fId" collection="fIds" open="(" separator="," close=")">
             #{fId}
         </foreach>
     </update>
@@ -2589,6 +2591,7 @@
         where
             tw.f_typeid = '1'
             and tw.del_flag = '0'
+            and f_cargo_planning = '0'
         <if test="fVslid != null ">and tw.f_vslid = #{fVslid}</if>
         <if test="fVoyid != null ">and tw.f_voyid = #{fVoyid}</if>
     </select>