凯和设备单功能

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

@@ -273,7 +273,8 @@ public class KHTWarehousebillsController extends BaseController
         if (tWarehouseBills.getfId() == null){
             throw new SecurityException("请选择替换的订单");
         }
-        return tWarehousebillsService.ruoYiVersionOrderListNew(tWarehouseBills);
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return tWarehousebillsService.ruoYiVersionOrderListNew(tWarehouseBills,loginUser);
     }
 
     //@PreAuthorize("@ss.hasPermi('warehouse:warehousebills:webVersionOrderDetails')")

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

@@ -265,7 +265,7 @@ FROM
     END AS contTime,
 	'青岛凯和志诚物流有限公司' AS useEnterprise,
 	'91370202MA3UG1T04A' AS useEnterpriseNo,
-	'QQCT' AS placeOfDeliveryCode,
+	'QDYG' AS placeOfDeliveryCode,
 	'大港' AS placeOfReturn,
 	'DGX' AS placeOfReturnCode,
 	'青岛凯和志诚物流有限公司' AS printEnterprise,

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

@@ -1235,6 +1235,24 @@ public class TWarehouseBills extends BaseEntity {
      */
     @Excel(name = "贸易方式(数据字典),对应t_trademodels ")
     private Long fNewTrademodeid;
+    /** 提货单发送人 */
+    @Excel(name = "提货单发送人")
+    private String pickUpPerson;
+
+    /** 提货单发送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "提货单发送时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date pickUpTime;
+
+    /** 设备单发送人 */
+    @Excel(name = "设备单发送人")
+    private String facilityPerson;
+
+    /** 设备单发送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "设备单发送时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date facilityTime;
+
 
     public Long getfLoadportid() {
         return fLoadportid;
@@ -2052,6 +2070,38 @@ public class TWarehouseBills extends BaseEntity {
         this.fCaregoStatus = fCaregoStatus;
     }
 
+    public String getPickUpPerson() {
+        return pickUpPerson;
+    }
+
+    public void setPickUpPerson(String pickUpPerson) {
+        this.pickUpPerson = pickUpPerson;
+    }
+
+    public Date getPickUpTime() {
+        return pickUpTime;
+    }
+
+    public void setPickUpTime(Date pickUpTime) {
+        this.pickUpTime = pickUpTime;
+    }
+
+    public String getFacilityPerson() {
+        return facilityPerson;
+    }
+
+    public void setFacilityPerson(String facilityPerson) {
+        this.facilityPerson = facilityPerson;
+    }
+
+    public Date getFacilityTime() {
+        return facilityTime;
+    }
+
+    public void setFacilityTime(Date facilityTime) {
+        this.facilityTime = facilityTime;
+    }
+
     @Override
     public String toString() {
         return "TWarehouseBills{" +
@@ -2204,6 +2254,10 @@ public class TWarehouseBills extends BaseEntity {
                 ", fShipTwoName=" + fShipTwoName +
                 ", fVoyTwo=" + fVoyTwo +
                 ", fVoyTwoName=" + fVoyTwoName +
+                ", pickUpPerson=" + pickUpPerson +
+                ", pickUpTime=" + pickUpTime +
+                ", facilityPerson=" + facilityPerson +
+                ", facilityTime=" + facilityTime +
                 '}';
     }
 }

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

@@ -391,7 +391,7 @@ public interface ITWarehouseBillsService {
      */
     public List<Map<String, Object>> ruoYiVersionOrderList(LoginUser loginUser, TWarehouseBills tWarehouseBills);
 
-    AjaxResult ruoYiVersionOrderListNew(TWarehouseBills tWarehouseBills);
+    AjaxResult ruoYiVersionOrderListNew(TWarehouseBills tWarehouseBills,LoginUser loginUser);
 
     /**
      * 网站查询订单

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

@@ -2983,7 +2983,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     @Override
-    public AjaxResult ruoYiVersionOrderListNew(TWarehouseBills tWarehouseBills) {
+    public AjaxResult ruoYiVersionOrderListNew(TWarehouseBills tWarehouseBills,LoginUser loginUser) {
         List<Map<String, Object>> result = tWarehouseBillsMapper.ruoYiVersionOrderList(tWarehouseBills);
         List<ShipperDataVo> list = new ArrayList<>();
         try {
@@ -3083,9 +3083,19 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 // 请求路径 （正式）
                 //String postUrl = "https://api.qingdao-port.net/container/web/wlds_eir/edo/shipagent/insertEdo.do";
                 // 请求参数
+                Map<String, String> hashMap = new HashMap<>();
+                hashMap.put("customerCode", "A00001");
+                hashMap.put("data", json);
+                hashMap.put("reqTime", StringUtils.nowTimeStr());
+                //获取数字签名所需的数据
+                String formatUrlMap = TWarehouseBillsServiceImpl.formatUrlMap(hashMap, false, false);
+                //获取数字签名
+                String privateKey = "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKkgGJtjBAHHXylZ7SjHiTRf4uU/R8uzEnx4YJgAdMMEcBMAgsdXpkMjuVPeMzksHpWTfpdhnf307l2lE4NgZ2txUJZivAQDP9MquH4jQDym0zPLjXGPYykxO0FqQdIYcjXM9doygz5GcXtTGQDz+6Btz4XWBQC18mOsygaxa6qpAgMBAAECgYA58z17QNpGocIBsUaKCpUA1ToxwxUevyU+cSDn9IANsp+UY0BsfaQCrWL7Uc/Lb0qrhfaCeHhiZGKow7+D7KyCm/DynU7WcW0Z0JLlG2nwQBT/Opwg2WDF7wHnlf0Y5QmArZ8ioabagKWBTyJr358xCC3NNZ8AYQB5ToDdYXOO4QJBAPKieA0v0pUii/3lnPDs83IxMEDy9rAW5OsPzt/De5Rk8k3TwN9kJcrv6toVcU3OsZWqkLy9CvBmn7X05otlp0sCQQCycQfT2Ad5kLN06OKs0Y6WEQNFtW+XgSu+ X7is6feklUUOmAS0UwhYfClFoB5Ddija5MgwZeWJtWr2zsnYrLlbAkBDsSglJa5uhRDhaOn8HV9eAHMh66b/QaPkIKjqrLMRl4gyRl2M9XfFwmGXLlxKBNxukQOIZIVkxHzSWtznDxk5AkARfE3+Dk89NFbBgAimUqqcPfKKJCtZN0koEI0yNIMV16K6uV7MpM5OjWwl7HjKt4ttV7neND337pUatkzFNLe9AkEA7EzVn6WL45D4gaDwp6sRGTOMuyC9GyE1U4Vi 4eRLBpTGdPJTJYz3Pgg4Pr0Sp+1x7bxOaQ/V1XyiL3AMxKfWnw==";
+                String sign = TWarehouseBillsServiceImpl.sign(formatUrlMap, privateKey, "UTF-8");
+
                 MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
                 params.add("customerCode", "A00001");
-                params.add("sign", "abcdef");
+                params.add("sign", sign);
                 params.add("reqTime", StringUtils.nowTimeStr());
                 params.add("data", json);
                 TResponseVo responseVo = sendPostRequest(postUrl, params);
@@ -3094,6 +3104,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 if (!responseVo.isSuccess()) {
                     throw new WarehouseException(responseVo.getMessage().get("msg"));
                 }
+                //修改订单信息
+                TWarehouseBills bills = new TWarehouseBills();
+                bills.setfId(tWarehouseBills.getfId());
+                bills.setPickUpPerson(loginUser.getUsername());
+                bills.setPickUpTime(new Date());
+                tWarehouseBillsMapper.updateKaHeOrder(bills);
             }
         } catch (Exception e) {
             e.printStackTrace();
@@ -9273,9 +9289,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TResponseVo responseVo = sendPostRequest(postUrl, params);
         if (!responseVo.isSuccess()) {
             throw new WarehouseException(responseVo.getMessage().get("msg"));
-        }else {
-            return AjaxResult.success(responseVo.getMessage().get("msg"));
         }
+        //修改订单信息
+        tWarehouseBills.getOrderList().stream().forEach(item ->{
+            //修改订单信息
+            TWarehouseBills bills = new TWarehouseBills();
+            bills.setfId(item);
+            bills.setFacilityPerson(loginUser.getUsername());
+            bills.setFacilityTime(new Date());
+            tWarehouseBillsMapper.updateKaHeOrder(bills);
+        });
+        return AjaxResult.success(responseVo.getMessage().get("msg"));
+
     }
 
     /**

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

@@ -131,6 +131,10 @@
         <result property="fCaregoStatus"    column="f_carego_status"    />
         <result property="fShipTwo"    column="f_ship_two"    />
         <result property="fVoyTwo"    column="f_voy_two"    />
+        <result property="pickUpPerson"    column="pick_up_person"    />
+        <result property="pickUpTime"    column="pick_up_time"    />
+        <result property="facilityPerson"    column="facility_person"    />
+        <result property="facilityTime"    column="facility_time"    />
     </resultMap>
 
     <resultMap type="WarehouseBillsVO" id="WarehousebillsVOResult">
@@ -155,7 +159,7 @@
         free_container_date, f_business_attribution, f_fee_status, 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,f_cargo_planning,
-        f_arrival_status,f_dismount_status,f_serviceitems_new,f_receivable,f_recycle,f_due,f_pay,f_carego_status, f_ship_two, f_voy_two from t_warehousebills
+        f_arrival_status,f_dismount_status,f_serviceitems_new,f_receivable,f_recycle,f_due,f_pay,f_carego_status, f_ship_two, f_voy_two, pick_up_person, pick_up_time, facility_person, facility_time from t_warehousebills
     </sql>
 
     <select id="selectTWarehousebillsList" parameterType="TWarehousebills" resultMap="TWarehousebillsResult">
@@ -1171,6 +1175,10 @@
             <if test="fCaregoStatus != null">f_carego_status,</if>
             <if test="fShipTwo != null">f_ship_two,</if>
             <if test="fVoyTwo != null">f_voy_two,</if>
+            <if test="pickUpPerson != null">pick_up_person,</if>
+            <if test="pickUpTime != null">pick_up_time,</if>
+            <if test="facilityPerson != null">facility_person,</if>
+            <if test="facilityTime != null">facility_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fBillno != null">#{fBillno},</if>
@@ -1298,6 +1306,10 @@
             <if test="fCaregoStatus != null">#{fCaregoStatus},</if>
             <if test="fShipTwo != null">#{fShipTwo},</if>
             <if test="fVoyTwo != null">#{fVoyTwo},</if>
+            <if test="pickUpPerson != null">#{pickUpPerson},</if>
+            <if test="pickUpTime != null">#{pickUpTime},</if>
+            <if test="facilityPerson != null">#{facilityPerson},</if>
+            <if test="facilityTime != null">#{facilityTime},</if>
         </trim>
     </insert>
 
@@ -1429,6 +1441,10 @@
             <if test="fCaregoStatus != null">f_carego_status = #{fCaregoStatus},</if>
             <if test="fShipTwo != null">f_ship_two = #{fShipTwo},</if>
             <if test="fVoyTwo != null">f_voy_two = #{fVoyTwo},</if>
+            <if test="pickUpPerson != null">pick_up_person = #{pickUpPerson},</if>
+            <if test="pickUpTime != null">pick_up_time = #{pickUpTime},</if>
+            <if test="facilityPerson != null">facility_person = #{facilityPerson},</if>
+            <if test="facilityTime != null">facility_time = #{facilityTime},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1561,6 +1577,10 @@
             <if test="fCaregoStatus != null">f_carego_status = #{fCaregoStatus},</if>
             <if test="fShipTwo != null">f_ship_two = #{fShipTwo},</if>
             <if test="fVoyTwo != null">f_voy_two = #{fVoyTwo},</if>
+            <if test="pickUpPerson != null">pick_up_person = #{pickUpPerson},</if>
+            <if test="pickUpTime != null">pick_up_time = #{pickUpTime},</if>
+            <if test="facilityPerson != null">facility_person = #{facilityPerson},</if>
+            <if test="facilityTime != null">facility_time = #{facilityTime},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -2087,7 +2107,11 @@
         WHEN tw.f_carego_status = '3' THEN '扣货'
         END AS fCaregoStatus,
         tv1.f_name fShipTwoName,
-        ty1.f_no fVoyTwoName
+        ty1.f_no fVoyTwoName,
+        tw.pick_up_person AS pickUpPerson,
+        tw.pick_up_time AS pickUpTime,
+        tw.facility_person AS facilityPerson,
+        tw.facility_time AS facilityTime
         FROM
         t_warehousebills tw
         LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
@@ -2659,7 +2683,11 @@
                tv1.f_name fShipTwoName,
                ty1.f_no fVoyTwoName,
                tw.f_ship_two,
-               tw.f_voy_two
+               tw.f_voy_two,
+               tw.pick_up_person,
+               tw.pick_up_time,
+               tw.facility_person,
+               tw.facility_time
         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