增加到货物流备注

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/logistics/po/LogisticsInfos.java

@@ -103,4 +103,9 @@ public class LogisticsInfos extends BasePo {
      */
     private Long stockWaitId;
 
+    /**
+     * 到货物流备注
+     */
+    private String arrivalRemark;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/WmsServiceImpl.java

@@ -154,4 +154,15 @@ public class WmsServiceImpl implements WmsService {
     public void purchaseBackOutbound(StockWaitDto stockWaitDto) {
         purchaseBackService.backOuts(stockWaitDto);
     }
+
+    @Override
+    public void editArrivalRemark(Long businessId, String arrivalRemark){
+        logisticsInfosService.update(q->q.eq(LogisticsInfos::getBusinessId,businessId).set(LogisticsInfos::getArrivalRemark,arrivalRemark));
+    }
+
+    @Override
+    public String getArrivalRemark(Long businessId){
+        LogisticsInfos one = logisticsInfosService.getOne(q -> q.eq(LogisticsInfos::getBusinessId, businessId));
+        return ObjectUtil.isNotEmpty(one)?one.getArrivalRemark():"";
+    }
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockWaitDto.java

@@ -77,4 +77,9 @@ public class StockWaitDto extends StockWait {
      */
     private String reservationCode;
 
+    /**
+     * 到货物流备注
+     */
+    private String arrivalRemark;
+
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockWaitVo.java

@@ -95,4 +95,9 @@ public class StockWaitVo extends StockWait {
      */
     private String detailedAddress;
 
+    /**
+     * 到货备注
+     */
+    private String arrivalRemark;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/WmsService.java

@@ -48,4 +48,8 @@ public interface WmsService {
      * 采购退货excel出库
      */
     void purchaseBackOutbound(StockWaitDto stockWaitDto);
+
+    void editArrivalRemark(Long businessId, String arrivalRemark);
+
+    String getArrivalRemark(Long businessId);
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -244,6 +244,13 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             Object purchaseBackInfo = wmsService.getPurchaseBackInfo(result.getBusinessId());
             result.setPurchaseBackInfo(purchaseBackInfo);
         }
+
+        //到货物流备注
+        String victoriatouristJson = stockWait.getVictoriatouristJson();
+        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
+        String arrivalRemark = wmsService.getArrivalRemark(json.getLong("deliverGoodsId"));
+        result.setArrivalRemark(arrivalRemark);
+
         return result;
     }
 
@@ -271,6 +278,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockWait.setVictoriatouristJson(JSONObject.toJSONString(json, JSONWriter.Feature.WriteLongAsString));
         updateById(stockWait);
 
+        //到货物流备注
+        Long deliverGoodsId = json.getLong("deliverGoodsId");
+        wmsService.editArrivalRemark(deliverGoodsId, stockWaitDto.getArrivalRemark());
+
         //如果是采购到货 计算结存单价
         if (StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType().equals(stockWait.getBusinessType())) {
             List<Long> productIds = stockWaitDetailsDtoList.stream().map(StockWaitDetails::getProductId).distinct().collect(Collectors.toList());
@@ -363,7 +374,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         }
 
 
-
         //库存操作类型
         Integer opType = -1;
         //到货入库
@@ -395,7 +405,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             arrivalStockRecords.setStockJournalId(stockJournal.getId());
             arrivalStockRecordsService.save(arrivalStockRecords);
             //创建入库明细
-            arrivalStockRecordsDetailsList.forEach(item->item.setArrivalStockRecordsId(arrivalStockRecords.getId()));
+            arrivalStockRecordsDetailsList.forEach(item -> item.setArrivalStockRecordsId(arrivalStockRecords.getId()));
             arrivalStockRecordsDetailsService.saveBatch(arrivalStockRecordsDetailsList);
         }
         //如果是采购到货修改到货状态

hx-wms/src/main/resources/mapper/stock/StockWaitMapper.xml

@@ -39,7 +39,8 @@
             sw.victoriatourist_json,
             lis.logistics_company_code,
             lis.`code` AS logisticsCode,
-            if(sw.business_type =5,(select jd.address from bytesailing_victoriatourist.jd_order jd where jd.id = sw.business_id and jd.del_flag = 0),pb.detailed_address) as detailedAddress
+            if(sw.business_type =5,(select jd.address from bytesailing_victoriatourist.jd_order jd where jd.id = sw.business_id and jd.del_flag = 0),pb.detailed_address) as detailedAddress,
+            lis.arrival_remark
         FROM
             stock_wait sw
                 LEFT JOIN stock_wait_details swd ON swd.stock_wait_id = sw.id