凯和配船功能，仓库排序加字段

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

@@ -414,4 +414,15 @@ public class KHTWarehousebillsController extends BaseController
         }
         return tWarehousebillsService.batchModifyingVesselVoyage(tWarehousebills.getOrderId(),tWarehousebills.getfVslid(),tWarehousebills.getfVoyid());
     }
+
+    /**
+     * 配船
+     * @param tWarehousebills 主表
+     * fCargoPlanning 是否配船(0 是 1 否) 默认为1
+     * @return
+     */
+    @PostMapping("/cargoPlanning")
+    public AjaxResult cargoPlanning(@RequestBody TWarehouseBills tWarehousebills){
+        return toAjax(tWarehousebillsService.updateKaHeOrder(tWarehousebills));
+    }
 }

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

@@ -558,6 +558,9 @@ public class TWarehouseBills extends BaseEntity {
     /** 收费提示字段 */
     @Excel(name = "收费提示字段")
     private String fRemarksFees;
+    /** 是否配船(0 是 1 否) */
+    @Excel(name = "是否配船(0 是 1 否)")
+    private Integer fCargoPlanning;
 
     /** 仓储费计费类型 */
     @Excel(name = "仓储费计费类型")
@@ -671,6 +674,14 @@ public class TWarehouseBills extends BaseEntity {
     //凯和订单ID
     private Long[] orderId;
 
+    public Integer getfCargoPlanning() {
+        return fCargoPlanning;
+    }
+
+    public void setfCargoPlanning(Integer fCargoPlanning) {
+        this.fCargoPlanning = fCargoPlanning;
+    }
+
     public String getfRemarksFees() {
         return fRemarksFees;
     }
@@ -1881,6 +1892,7 @@ public class TWarehouseBills extends BaseEntity {
                 ", fSubmitUpdate=" + fSubmitUpdate +
                 ", fDeleteStatus=" + fDeleteStatus +
                 ", fRemarksFees=" + fRemarksFees +
+                ", fCargoPlanning=" + fCargoPlanning +
                 '}';
     }
 }

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

@@ -537,4 +537,11 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult batchModifyingVesselVoyage(Long[] fIds,Long fVessel,Long fVoyage);
+    /**
+     * 凯和修改订单信息
+     *
+     * @param tWarehousebills 详情主表
+     * @return 结果
+     */
+    public int updateKaHeOrder(TWarehouseBills tWarehousebills);
 }

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

@@ -5264,6 +5264,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         }
     }
 
+    @Override
+    public int updateKaHeOrder(TWarehouseBills tWarehousebills) {
+        return tWarehouseBillsMapper.updateKaHeOrder(tWarehousebills);
+    }
+
     private String getAbsoluteFile(String fileName) {
         String downloadPath = RuoYiConfig.getDownloadPath() + fileName;
         File desc = new File(downloadPath);

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

@@ -115,6 +115,7 @@
         <result property="fSubmitUpdate"    column="f_submit_update"/>
         <result property="fDeleteStatus"    column="f_delete_status"/>
         <result property="fRemarksFees"    column="f_remarks_fees"    />
+        <result property="fCargoPlanning"    column="f_cargo_planning"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
@@ -127,7 +128,7 @@
         f_consigneeattn, f_consigneetel, f_insurance, f_insuranceamt, f_closedate, f_docmentdate, f_vslid, f_voyid, f_typeid, f_paymode, f_laneid, f_cntval,
         free_container_date, f_business_attribution, f_supervision_unit, f_declaration_elements, f_part_number, f_ifinspection, f_value, f_weighing_date,
         f_ifsampling, send_sample_date, f_ifweight_recovery, weight_recovery_date, warehouse_status, f_times ,f_date_changed, f_chargetype,f_weigh_weight,
-               f_predict_branch,f_grade,f_delivery_details,f_salesman_id,f_itemstatus,f_updete_status, f_submit_update, f_delete_status,f_remarks_fees from t_warehousebills
+               f_predict_branch,f_grade,f_delivery_details,f_salesman_id,f_itemstatus,f_updete_status, f_submit_update, f_delete_status,f_remarks_fees,f_cargo_planning from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -385,7 +386,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_billstatus , bill.f_bsdate DESC
+        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectWarehouseBusinessList1" parameterType="TWarehousebills" resultType="Map">
@@ -537,7 +538,7 @@
             <if test="fNewTrademodeid != null ">and bill.f_new_trademodeid = #{fNewTrademodeid}</if>
         </where>
         ${params.dataScope}
-        ORDER BY bill.f_billstatus , bill.f_bsdate DESC
+        ORDER BY bill.f_bsdate DESC, bill.f_bstime DESC,bill.f_id DESC,bill.f_billstatus
     </select>
 
     <select id="selectTWarehousebillsById" parameterType="Long" resultMap="TWarehousebillsResult">
@@ -891,6 +892,7 @@
             <if test="fSubmitUpdate != null">f_submit_update,</if>
             <if test="fDeleteStatus != null">f_delete_status,</if>
             <if test="fRemarksFees != null">f_remarks_fees,</if>
+            <if test="fCargoPlanning != null">f_cargo_planning,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -1002,6 +1004,7 @@
             <if test="fSubmitUpdate != null">#{fSubmitUpdate},</if>
             <if test="fDeleteStatus != null">#{fDeleteStatus},</if>
             <if test="fRemarksFees != null">#{fRemarksFees},</if>
+            <if test="fCargoPlanning != null">#{fCargoPlanning},</if>
         </trim>
     </insert>
 
@@ -1117,6 +1120,7 @@
             <if test="fSubmitUpdate != null">f_submit_update = #{fSubmitUpdate},</if>
             <if test="fDeleteStatus != null">f_delete_status = #{fDeleteStatus},</if>
             <if test="fRemarksFees != null">f_remarks_fees = #{fRemarksFees},</if>
+            <if test="fCargoPlanning != null">f_cargo_planning = #{fCargoPlanning},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1234,6 +1238,7 @@
             <if test="fSubmitUpdate != null">f_submit_update = #{fSubmitUpdate},</if>
             <if test="fDeleteStatus != null">f_delete_status = #{fDeleteStatus},</if>
             <if test="fRemarksFees != null">f_remarks_fees = #{fRemarksFees},</if>
+            <if test="fCargoPlanning != null">f_cargo_planning = #{fCargoPlanning},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1502,7 +1507,8 @@
             tr.f_name laneidName,
             tw.f_updete_status,
             tw.f_submit_update,
-            tw.f_delete_status
+            tw.f_delete_status,
+            tw.f_cargo_planning
         FROM t_warehousebills tw
             LEFT JOIN t_address address ON address.f_id = tw.f_loadportid
             LEFT JOIN t_address ta ON ta.f_id = tw.f_loadportid
@@ -1709,7 +1715,8 @@
         END AS moneyStatus,
         tw.f_updete_status fUpdeteStatus,
         tw.f_submit_update fSubmitUpdate,
-        tw.f_delete_status fDeleteStatus
+        tw.f_delete_status fDeleteStatus,
+        tw.f_cargo_planning fCargoPlanning
         FROM
         t_warehousebills tw
         LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
@@ -1958,7 +1965,8 @@
         tw.f_updete_status fUpdeteStatus,
         tw.f_submit_update fSubmitUpdate,
         tw.f_delete_status fDeleteStatus,
-        ROUND(IFNULL(tf.fAmount,0),2) fAmount
+        ROUND(IFNULL(tf.fAmount,0),2) fAmount,
+        tw.f_cargo_planning fCargoPlanning
         FROM
         t_warehousebills tw
         LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
@@ -2215,7 +2223,8 @@
                tr.f_name      laneidName,
                tw.f_updete_status,
                tw.f_submit_update,
-               tw.f_delete_status
+               tw.f_delete_status,
+               tw.f_cargo_planning
         FROM t_warehousebills tw
                  LEFT JOIN t_address address ON address.f_id = tw.f_loadportid
                  LEFT JOIN t_address ta ON ta.f_id = tw.f_loadportid