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

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

@@ -4,6 +4,7 @@ import java.io.*;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.service.ITCorpsService;
 import com.ruoyi.basicData.service.ITGoodsService;
@@ -393,4 +394,23 @@ public class KHTWarehousebillsController extends BaseController
     {
         return tWarehousebillsService.getMblno(tWarehousebills);
     }
+
+    /**
+     * 批量修改船名航次
+     * @param tWarehousebills
+     * @return
+     */
+    @PostMapping("/batchModifyingVesselVoyage")
+    public AjaxResult batchModifyingVesselVoyage(@RequestBody TWarehouseBills tWarehousebills){
+        if (tWarehousebills.getOrderId().length<1){
+            return AjaxResult.error("请选择要修改的订单");
+        }
+        if (tWarehousebills.getfVslid() == null){
+            return AjaxResult.error("请选择要修改为那条船");
+        }
+        if (tWarehousebills.getfVoyid() == null){
+            return AjaxResult.error("请选择要修改为那个航次");
+        }
+        return tWarehousebillsService.batchModifyingVesselVoyage(tWarehousebills.getOrderId(),tWarehousebills.getfVslid(),tWarehousebills.getfVoyid());
+    }
 }

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

@@ -36,7 +36,7 @@ public class TWarehousebillsCntritemsController extends BaseController
     /**
      * 查询凯和箱明细列表
      */
-    @PreAuthorize("@ss.hasPermi('shipping:cntritems:list')")
+    //@PreAuthorize("@ss.hasPermi('shipping:cntritems:list')")
     @GetMapping("/list")
     public TableDataInfo list(TWarehousebillsCntritems tWarehousebillsCntritems)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehousebillsitemsController.java

@@ -13,6 +13,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库明细从表Controller
@@ -87,4 +88,14 @@ public class TWarehousebillsitemsController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] fIds) {
         return toAjax(tWarehousebillsitemsService.deleteTWarehousebillsitemsByIds(fIds));
     }
+
+    /**
+     * 获取箱号
+     * @return
+     */
+    @GetMapping("/getFBoxNo")
+    public AjaxResult getFBoxNo(){
+        List<Map<String, Object>> maps = tWarehousebillsitemsService.selectStorageFeeItemfTruckNo();
+        return AjaxResult.success(maps);
+    }
 }

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

@@ -555,6 +555,9 @@ public class TWarehouseBills extends BaseEntity {
     /** 订单删除审批状态 */
     @Excel(name = "订单删除审批状态")
     private Long fDeleteStatus;
+    /** 收费提示字段 */
+    @Excel(name = "收费提示字段")
+    private String fRemarksFees;
 
     /** 仓储费计费类型 */
     @Excel(name = "仓储费计费类型")
@@ -665,6 +668,24 @@ public class TWarehouseBills extends BaseEntity {
     private List<TWarehousebillsfees> warehousebillsfeesCr;
     //费用状态
     private Long moneyStatus;
+    //凯和订单ID
+    private Long[] orderId;
+
+    public String getfRemarksFees() {
+        return fRemarksFees;
+    }
+
+    public void setfRemarksFees(String fRemarksFees) {
+        this.fRemarksFees = fRemarksFees;
+    }
+
+    public Long[] getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Long[] orderId) {
+        this.orderId = orderId;
+    }
 
     public Date getfPredictBranch() {
         return fPredictBranch;
@@ -1859,6 +1880,7 @@ public class TWarehouseBills extends BaseEntity {
                 ", fUpdeteStatus='" + fUpdeteStatus + '\'' +
                 ", fSubmitUpdate=" + fSubmitUpdate +
                 ", fDeleteStatus=" + fDeleteStatus +
+                ", fRemarksFees=" + fRemarksFees +
                 '}';
     }
 }

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

@@ -331,12 +331,23 @@ public class TWarehousebillsitems extends BaseEntity {
      * 备注
      */
     private String remark;
+    /** 车辆类型 */
+    @Excel(name = "车辆类型")
+    private Long fCartypeId;
     private String timeStartBsdate;
     private String timeEndBsdate;
 
     //报关单号
     private String fCustomno;
 
+    public Long getfCartypeId() {
+        return fCartypeId;
+    }
+
+    public void setfCartypeId(Long fCartypeId) {
+        this.fCartypeId = fCartypeId;
+    }
+
     public String getfNowCarton() {
         return fNowCarton;
     }
@@ -889,6 +900,7 @@ public class TWarehousebillsitems extends BaseEntity {
                 ", timeStartBsdate='" + timeStartBsdate + '\'' +
                 ", timeEndBsdate='" + timeEndBsdate + '\'' +
                 ", fNowCarton='" + fNowCarton + '\'' +
+                ", fCartypeId='" + fCartypeId + '\'' +
                 '}';
     }
 }

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

@@ -202,4 +202,22 @@ public interface TWarehouseBillsMapper extends BaseMapper<TWarehouseBills> {
      * @return
      */
     public List<deriveInventoryExcel> deriveInventory(TWarehouseBills tWarehouseBills);
+
+    /**
+     * 批量查询凯和订单的船名航次信息
+     * @param fIds
+     * @return
+     */
+    public List<TWarehouseBills> selectTWarehousebillsByIds(Long[] fIds);
+
+    /**
+     * 批量修改船名航次
+     * @param fIds 订单ID
+     * @param fVessel 船名
+     * @param fVoyage 航次
+     * @return
+     */
+    public int updateTWarehousebillsByIds(@Param("fIds") Long[] fIds,
+                                          @Param("fVessel") Long fVessel,
+                                          @Param("fVoyage") Long fVoyage);
 }

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

@@ -186,4 +186,10 @@ public interface TWarehousebillsitemsMapper extends BaseMapper<TWarehousebillsit
      * @return
      */
     public int updatefStorageFeeDeadlinefPid(@Param("fPid") Long fPid);
+
+    /**
+     * 查询明细表箱号
+     * @return
+     */
+    public List<Map<String,Object>> selectStorageFeeItemfTruckNo();
 }

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

@@ -528,4 +528,13 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult deleteOrder(TWarehouseBills tWarehouseBills,LoginUser loginUser);
+
+    /**
+     * 批量更改订单的船名航次
+     * @param fIds 订单ID
+     * @param fVessel 船名
+     * @param fVoyage 航次
+     * @return
+     */
+    public AjaxResult batchModifyingVesselVoyage(Long[] fIds,Long fVessel,Long fVoyage);
 }

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

@@ -5,6 +5,7 @@ import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库明细从表Service接口
@@ -68,4 +69,9 @@ public interface ITWarehousebillsitemsService {
      * @return
      */
     public int warehouseItemfItemstatus(Long fPid, Long fItemstatus);
+    /**
+     * 查询明细表箱号
+     * @return
+     */
+    public List<Map<String,Object>> selectStorageFeeItemfTruckNo();
 }

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

@@ -5207,6 +5207,24 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success();
     }
 
+    @Override
+    @Transactional
+    public AjaxResult batchModifyingVesselVoyage(Long[] fIds, Long fVessel, Long fVoyage) {
+        //先查要改的多个订单的船名航次是否一直
+        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);
+        if (i>= 1){
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.error("批量更新失败");
+        }
+    }
+
     private String getAbsoluteFile(String fileName) {
         String downloadPath = RuoYiConfig.getDownloadPath() + fileName;
         File desc = new File(downloadPath);

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库明细从表Service业务层处理
@@ -93,4 +94,9 @@ public class TWarehousebillsitemsServiceImpl implements ITWarehousebillsitemsSer
     public int warehouseItemfItemstatus(Long fPid, Long fItemstatus) {
         return tWarehousebillsitemsMapper.warehouseItemfItemstatus(fPid,fItemstatus);
     }
+
+    @Override
+    public List<Map<String, Object>> selectStorageFeeItemfTruckNo() {
+        return tWarehousebillsitemsMapper.selectStorageFeeItemfTruckNo();
+    }
 }

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

@@ -114,6 +114,7 @@
         <result property="fUpdeteStatus"    column="f_updete_status"/>
         <result property="fSubmitUpdate"    column="f_submit_update"/>
         <result property="fDeleteStatus"    column="f_delete_status"/>
+        <result property="fRemarksFees"    column="f_remarks_fees"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsVo">
@@ -126,7 +127,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 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 from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -287,7 +288,8 @@
             END AS fItemsStatus,
             bill.f_billno AS fBillno,
             g.f_name AS fGoodsid,
-            bill.f_storekeeper AS fStorekeeper
+            bill.f_storekeeper AS fStorekeeper,
+            bill.f_remarks_fees AS fRemarksFees
         FROM
             t_warehousebills bill
             LEFT JOIN t_goods g ON g.f_id = bill.f_goodsid
@@ -304,6 +306,7 @@
         <where>
             bill.f_typeid IS NULL
             <if test="fBillno != null  and fBillno != ''">and bill.f_billno like concat('%', #{fBillno}, '%')</if>
+            <if test="fTruckno != null  and fTruckno != ''">and item.f_truckno like concat('%', #{fTruckno}, '%')</if>
             <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and bill.f_customsdeclartion =
                 #{fCustomsdeclartion}
             </if>
@@ -449,7 +452,8 @@
         AS fItemsStatus,
         bill.f_billno AS fBillno,
         g.f_name AS fGoodsid,
-        bill.f_storekeeper AS fStorekeeper
+        bill.f_storekeeper AS fStorekeeper,
+        bill.f_remarks_fees AS fRemarksFees
         FROM
         t_warehousebills bill
         LEFT JOIN t_goods g ON g.f_id = bill.f_goodsid
@@ -468,6 +472,7 @@
             AND dict.dict_type = 'data_trademodes'
             AND bill.f_typeid IS NULL
             <if test="fBillno != null  and fBillno != ''">and bill.f_billno like concat('%', #{fBillno}, '%')</if>
+            <if test="fTruckno != null  and fTruckno != ''">and item.f_truckno like concat('%', #{fTruckno}, '%')</if>
             <if test="fCustomsdeclartion != null  and fCustomsdeclartion != ''">and bill.f_customsdeclartion =
                 #{fCustomsdeclartion}
             </if>
@@ -885,6 +890,7 @@
             <if test="fUpdeteStatus != null">f_updete_status,</if>
             <if test="fSubmitUpdate != null">f_submit_update,</if>
             <if test="fDeleteStatus != null">f_delete_status,</if>
+            <if test="fRemarksFees != null">f_remarks_fees,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -995,6 +1001,7 @@
             <if test="fUpdeteStatus != null">#{fUpdeteStatus},</if>
             <if test="fSubmitUpdate != null">#{fSubmitUpdate},</if>
             <if test="fDeleteStatus != null">#{fDeleteStatus},</if>
+            <if test="fRemarksFees != null">#{fRemarksFees},</if>
         </trim>
     </insert>
 
@@ -1109,6 +1116,7 @@
             <if test="fUpdeteStatus != null">f_updete_status = #{fUpdeteStatus},</if>
             <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>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1225,6 +1233,7 @@
             <if test="fUpdeteStatus != null">f_updete_status = #{fUpdeteStatus},</if>
             <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>
         </trim>
         where f_id = #{fId}
     </update>
@@ -2512,5 +2521,23 @@
             )a,
             (SELECT @rank:= 0) b
     </select>
+    <select id="selectTWarehousebillsByIds" parameterType="String" resultMap="TWarehousebillsResult">
+        select f_id,f_vslid, f_voyid from t_warehousebills
+        where f_id =
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </select>
+    <update id="updateTWarehousebillsByIds">
+        update
+        t_warehousebills
+        SET
+        f_vslid = #{fVslid},
+        f_voyid = #{fVoyid}
+        where f_id =
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </update>
 
 </mapper>

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

@@ -67,6 +67,7 @@
         <result property="fSealno" column="f_sealno"/>
         <result property="fNowCarton"  column="f_now_carton" />
         <result property="fItemstatus"    column="f_itemstatus"    />
+        <result property="fCartypeId"    column="f_cartype_id"    />
     </resultMap>
 
     <sql id="selectTWarehousebillsitemsVo">
@@ -76,7 +77,7 @@
            del_flag, create_by, create_time, update_by, update_time, remark, f_inventory_days, f_storage_fee_deadline, f_amt, f_billing_days,
             f_driver_name, f_driver_tel, f_driver_id_car, f_serial_number, f_is_pass, f_billtype, f_billing_qty, f_billing_deadline, f_business_type,
              f_is_inventory, f_warehouse_information, f_orgwarehouse_information, f_labour, f_fleet, f_stevedore, f_lntype, f_forkliftman,
-              f_localcntrno, f_sealno,f_now_carton,f_itemstatus from t_warehousebillsitems
+              f_localcntrno, f_sealno,f_now_carton,f_itemstatus,f_cartype_id from t_warehousebillsitems
     </sql>
 
     <select id="selectTWarehousebillsitemsList" parameterType="TWarehousebillsitems"
@@ -190,7 +191,8 @@
             item.f_sealno AS fSealno,
             item.f_warehouse_information AS fWarehouseInformation,
             item.f_orgwarehouse_information AS fOrgwarehouseInformation,
-            item.f_now_carton AS fNowCarton
+            item.f_now_carton AS fNowCarton,
+            item.f_cartype_id AS fCartypeId
         FROM
             t_warehousebills w
             LEFT JOIN t_warehousebillsitems item ON item.f_pid = w.f_id
@@ -274,6 +276,7 @@
             <if test="fSealno != null">f_sealno,</if>
             <if test="fNowCarton != null">f_now_carton,</if>
             <if test="fItemstatus != null">f_itemstatus,</if>
+            <if test="fCartypeId != null">f_cartype_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fPid != null">#{fPid},</if>
@@ -337,6 +340,7 @@
             <if test="fSealno != null">#{fSealno},</if>
             <if test="fNowCarton != null">#{fNowCarton},</if>
             <if test="fItemstatus != null">#{fItemstatus},</if>
+            <if test="fCartypeId != null">#{fCartypeId},</if>
         </trim>
     </insert>
 
@@ -404,6 +408,7 @@
             <if test="fSealno != null">f_sealno = #{fSealno},</if>
             <if test="fNowCarton != null">f_now_carton = #{fNowCarton},</if>
             <if test="fItemstatus != null">f_itemstatus = #{fItemstatus},</if>
+            <if test="fCartypeId != null">f_cartype_id = #{fCartypeId},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -746,5 +751,15 @@
         WHERE
         f_pid = #{fPid}
     </update>
+    <select id="selectStorageFeeItemfTruckNo" parameterType="string" resultType="Map">
+        SELECT
+        DISTINCT
+	        f_truckno AS fTruckno
+        FROM
+	        t_warehousebillsitems
+	    WHERE f_truckno IS NOT NULL
+        AND f_truckno != ''
+        ORDER BY CONVERT(f_truckno USING gbk) asc
+    </select>
 
 </mapper>