维多利亚问题处理

hx-common/src/main/java/com/fjhx/common/entity/corporation/po/Corporation.java

@@ -35,7 +35,7 @@ public class Corporation extends BasePo {
     /**
      * 企业类型
      */
-    private Integer type;
+    private String type;
 
     /**
      * 统一信用代码

hx-mes/src/main/java/com/fjhx/mes/entity/production/po/ProductionTaskDetail.java

@@ -67,4 +67,9 @@ public class ProductionTaskDetail extends BasePo {
      */
     private Integer circulationStatus;
 
+    /**
+     * 接收人id
+     */
+    private Long receivedUserId;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -127,6 +127,8 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
     public void circulation(ProductionTaskDetailDto productionTaskDetailDto) {
         //修改流转状态
         productionTaskDetailDto.setCirculationStatus(1);
+        //赋值接收人id
+        productionTaskDetailDto.setReceivedUserId(productionTaskDetailDto.getReceivedUserId());
         //赋值流转人id
         productionTaskDetailDto.setCirculationUserId(SecurityUtils.getUserId());
         this.updateById(productionTaskDetailDto);

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -78,7 +78,7 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 
         // 维多利亚扩展根据到货仓库id过滤
         wrapper.eq("json_unquote(t2.victoriatourist_json -> '$.receiptWarehouseId')", dto.getReceiptWarehouseId());
-        wrapper.eq("json_unquote(pi.victoriatourist_json -> '$.deptId')", dto.getDeptId());
+        wrapper.eq(ObjectUtil.isNotEmpty(dto.getDeptId()),"json_unquote(pi.victoriatourist_json -> '$.deptId')", dto.getDeptId().toString());
         //待采购过滤掉指定状态 例如不要 99 作废
         if (ObjectUtil.isNotEmpty(dto.getNeStatus())) {
             wrapper.notIn("t1", SubscribeDetail::getStatus, dto.getNeStatus().split(","));

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/dto/JdOrderDto.java

@@ -36,7 +36,9 @@ public class JdOrderDto extends JdOrder implements SetCustomizeAreaId {
      */
     private Long outWarehouseId;
 
-    /**调仓说明*/
+    /**
+     * 调仓说明
+     */
     private String remark;
 
     /**
@@ -50,4 +52,16 @@ public class JdOrderDto extends JdOrder implements SetCustomizeAreaId {
     private String cityName;
 
 
+    /**
+     * 物流公司编号
+     */
+    private String logisticsCompanyCode;
+    /**
+     * 物流编号
+     */
+    private String logisticsCode;
+    /**
+     * 预约号
+     */
+    private String reservationCode;
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/po/JdOrder.java

@@ -43,19 +43,19 @@ public class JdOrder extends BasePo {
     /**
      * 国家
      */
-    @NotBlank(message = "国家id不能为空")
+//    @NotBlank(message = "国家id不能为空")
     private Long countryId;
 
     /**
      * 省
      */
-    @NotBlank(message = "省id不能为空")
+//    @NotBlank(message = "省id不能为空")
     private Long provinceId;
 
     /**
      * 市
      */
-    @NotBlank(message = "市id不能为空")
+//    @NotBlank(message = "市id不能为空")
     private Long cityId;
 
     /**

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

@@ -69,4 +69,9 @@ public class LogisticsInfos extends BasePo {
      */
     private Integer isKd100;
 
+    /**
+     * 预约号
+     */
+    private String reservationCode;
+
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -19,6 +19,8 @@ import com.fjhx.victoriatourist.entity.jd.po.JdOrder;
 import com.fjhx.victoriatourist.entity.jd.po.JdOrderDetails;
 import com.fjhx.victoriatourist.entity.jd.vo.JdOrderDetailsVo;
 import com.fjhx.victoriatourist.entity.jd.vo.JdOrderVo;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.entity.stock.dto.StockTransferDto;
 import com.fjhx.victoriatourist.entity.stock.po.StockTransfer;
 import com.fjhx.victoriatourist.entity.stock.po.StockTransferDetails;
@@ -26,6 +28,8 @@ import com.fjhx.victoriatourist.mapper.jd.JdOrderMapper;
 import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
 import com.fjhx.victoriatourist.service.jd.JdOrderDetailsService;
 import com.fjhx.victoriatourist.service.jd.JdOrderService;
+import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
+import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
 import com.fjhx.victoriatourist.service.stock.StockTransferService;
 import com.fjhx.victoriatourist.utils.CodeEnum;
@@ -72,18 +76,22 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
     @Autowired
     private StockTransferDetailsService stockTransferDetailsService;
     @Autowired
-    StockWaitService stockWaitService;
+    private StockWaitService stockWaitService;
     @Autowired
-    StockWaitDetailsService stockWaitDetailsService;
+    private StockWaitDetailsService stockWaitDetailsService;
 
     @Autowired
-    AbnormalInfoService abnormalInfoService;
+    private AbnormalInfoService abnormalInfoService;
     @Autowired
-    StockJournalService stockJournalService;
+    private StockJournalService stockJournalService;
     @Autowired
-    StockJournalDetailsService stockJournalDetailsService;
+    private StockJournalDetailsService stockJournalDetailsService;
     @Autowired
-    StockService stockService;
+    private StockService stockService;
+    @Autowired
+    private LogisticsInfosService logisticsInfosService;
+    @Autowired
+    private LogisticsDetailsService logisticsDetailsService;
 
     @Override
     public Page<JdOrderVo> getPage(JdOrderSelectDto dto) {
@@ -177,6 +185,9 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         this.jdOrderDetailsService.saveBatch(jdOrderDetailsList);
 
         CustomizeAreaUtil.setAreaId(jdOrderDto);
+
+
+
     }
 
     @DSTransactional
@@ -324,6 +335,28 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
             //保存出库记录明细
             stockJournalDetailsService.saveBatch(stockJournalDetailsList1);
         }
+
+        //创建物流数据
+        LogisticsInfos logisticsInfos = new LogisticsInfos();
+        logisticsInfos.setBusinessId(jdOrderDto.getId());
+        logisticsInfos.setBusinessCode(jdOrderDto.getCode());
+        logisticsInfos.setBusinessType(2);//京东订单出库
+        logisticsInfos.setLogisticsCompanyCode(jdOrderDto.getLogisticsCompanyCode());
+        logisticsInfos.setCode(jdOrderDto.getLogisticsCode());
+        logisticsInfos.setWarehouseId(jdOrderDto.getOutWarehouseId());
+        logisticsInfos.setReservationCode(jdOrderDto.getReservationCode());
+        logisticsInfos.setIsKd100(0);
+        logisticsInfosService.save(logisticsInfos);
+
+        List<LogisticsDetails> logisticsDetailsList = new ArrayList<>();
+        for (JdOrderDetails jdOrderDetails : jdOrderDetailsList) {
+            LogisticsDetails logisticsDetails =new LogisticsDetails();
+            logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
+            logisticsDetails.setLogisticsInfoCode(logisticsInfos.getCode());
+            logisticsDetails.setBusinessDetailsId(jdOrderDetails.getId());
+            logisticsDetails.setReceiptQuantity(jdOrderDetails.getQuantity());
+        }
+        logisticsDetailsService.saveBatch(logisticsDetailsList);
     }
 
     @Override

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/order/impl/OrderInfoServiceImpl.java

@@ -10,6 +10,8 @@ import com.fjhx.area.utils.CustomizeAreaUtil;
 import com.fjhx.customer.entity.customer.po.Customer;
 import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.entity.order.dto.OrderInfoDto;
 import com.fjhx.victoriatourist.entity.order.dto.OrderInfoSelectDto;
 import com.fjhx.victoriatourist.entity.order.po.OrderDetails;
@@ -17,6 +19,8 @@ import com.fjhx.victoriatourist.entity.order.po.OrderInfo;
 import com.fjhx.victoriatourist.entity.order.vo.OrderDetailsVo;
 import com.fjhx.victoriatourist.entity.order.vo.OrderInfoVo;
 import com.fjhx.victoriatourist.mapper.order.OrderInfoMapper;
+import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
+import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.fjhx.victoriatourist.service.order.OrderDetailsService;
 import com.fjhx.victoriatourist.service.order.OrderInfoService;
 import com.fjhx.victoriatourist.utils.Assert;
@@ -48,17 +52,22 @@ import java.util.List;
 @Service
 public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo> implements OrderInfoService {
     @Autowired
-    CustomerService customerService;
+    private CustomerService customerService;
     @Autowired
-    AreaInfoService areaInfoService;
+    private AreaInfoService areaInfoService;
     @Autowired
-    OrderDetailsService orderDetailsService;
+    private OrderDetailsService orderDetailsService;
     @Autowired
-    ProductInfoService productInfoService;
+    private ProductInfoService productInfoService;
     @Autowired
-    StockWaitService stockWaitService;
+    private StockWaitService stockWaitService;
     @Autowired
-    StockWaitDetailsService stockWaitDetailsService;
+    private StockWaitDetailsService stockWaitDetailsService;
+
+    @Autowired
+    private LogisticsInfosService logisticsInfosService;
+    @Autowired
+    private LogisticsDetailsService logisticsDetailsService;
 
     @Override
     public Page<OrderInfoVo> getPage(OrderInfoSelectDto dto) {
@@ -230,6 +239,24 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             orderInfo.setIssueStatus(2);//出库状态 1未出库 2进行中 3已出库
         }
         updateById(orderInfo);
+
+        //创建物流数据
+        LogisticsInfos logisticsInfos = new LogisticsInfos();
+        logisticsInfos.setBusinessId(orderInfo.getId());
+        logisticsInfos.setBusinessCode(orderInfo.getCode());
+        logisticsInfos.setBusinessType(3);//销售订单出库
+        logisticsInfos.setLogisticsCompanyCode(stockWaitDetailsDto.getLogisticsCompanyCode());
+        logisticsInfos.setCode(stockWaitDetailsDto.getLogisticsCode());
+        logisticsInfos.setWarehouseId(stockWaitDetailsDto.getWarehouseId());
+        logisticsInfos.setIsKd100(0);
+        logisticsInfosService.save(logisticsInfos);
+
+        LogisticsDetails logisticsDetails = new LogisticsDetails();
+        logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
+        logisticsDetails.setLogisticsInfoCode(logisticsInfos.getCode());
+        logisticsDetails.setBusinessDetailsId(orderDetails.getId());
+        logisticsDetails.setReceiptQuantity(orderDetails.getQuantity());
+        logisticsDetailsService.save(logisticsDetails);
     }
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/purchase/impl/PurchaseBackServiceImpl.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.service.purchase.PurchaseService;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsDetails;
+import com.fjhx.victoriatourist.entity.logistics.po.LogisticsInfos;
 import com.fjhx.victoriatourist.entity.purchase.dto.PurchaseBackDto;
 import com.fjhx.victoriatourist.entity.purchase.dto.PurchaseBackSelectDto;
 import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBack;
@@ -17,6 +19,8 @@ import com.fjhx.victoriatourist.entity.purchase.po.PurchaseBackDetails;
 import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackDetailsVo;
 import com.fjhx.victoriatourist.entity.purchase.vo.PurchaseBackVo;
 import com.fjhx.victoriatourist.mapper.purchase.PurchaseBackMapper;
+import com.fjhx.victoriatourist.service.logistics.LogisticsDetailsService;
+import com.fjhx.victoriatourist.service.logistics.LogisticsInfosService;
 import com.fjhx.victoriatourist.service.purchase.PurchaseBackDetailsService;
 import com.fjhx.victoriatourist.service.purchase.PurchaseBackService;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
@@ -60,6 +64,10 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
     private StockService stockService;
     @Autowired
     private PurchaseService purchaseService;
+    @Autowired
+    private LogisticsInfosService logisticsInfosService;
+    @Autowired
+    private LogisticsDetailsService logisticsDetailsService;
 
     @Override
     public Page<PurchaseBackVo> getPage(PurchaseBackSelectDto dto) {
@@ -143,6 +151,25 @@ public class PurchaseBackServiceImpl extends ServiceImpl<PurchaseBackMapper, Pur
         List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), 4, Arrays.asList(stock), stockWaitDetailsDto.getWarehouseId());
         //保存出入库明细
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
+
+
+        //创建物流数据
+        LogisticsInfos logisticsInfos = new LogisticsInfos();
+        logisticsInfos.setBusinessId(byId.getId());
+        logisticsInfos.setBusinessCode(byId.getBusinessCode());
+        logisticsInfos.setBusinessType(5);//采购退货
+        logisticsInfos.setLogisticsCompanyCode(stockWaitDetailsDto.getLogisticsCompanyCode());
+        logisticsInfos.setCode(stockWaitDetailsDto.getLogisticsCode());
+        logisticsInfos.setWarehouseId(stockWaitDetailsDto.getWarehouseId());
+        logisticsInfos.setIsKd100(0);
+        logisticsInfosService.save(logisticsInfos);
+
+        LogisticsDetails logisticsDetails = new LogisticsDetails();
+        logisticsDetails.setLogisticsInfoId(logisticsInfos.getId());
+        logisticsDetails.setLogisticsInfoCode(logisticsInfos.getCode());
+        logisticsDetails.setBusinessDetailsId(stockWaitDetailsDto.getId());
+        logisticsDetails.setReceiptQuantity(stockWaitDetailsDto.getQuantity());
+        logisticsDetailsService.save(logisticsDetails);
     }
 
 }

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

@@ -23,4 +23,13 @@ public class StockWaitDetailsDto extends StockWaitDetails {
      * 仓库id
      */
     private Long warehouseId;
+
+    /**
+     * 物流公司编号
+     */
+    private String logisticsCompanyCode;
+    /**
+     * 物流编号
+     */
+    private String logisticsCode;
 }

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

@@ -71,4 +71,9 @@ public class StockWaitDetailsVo extends StockWaitDetails {
      */
     private BigDecimal receiptQuantity;
 
+    /**
+     * 产品自定义编码
+     */
+    private String productCustomCode;
+
 }

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

@@ -178,6 +178,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
                 }
                 stockWaitDetails.setProductName(productInfo.getName());
                 stockWaitDetails.setProductCode(productInfo.getCode());
+                stockWaitDetails.setProductCustomCode(productInfo.getCustomCode());
             }
         }
         result.setStockWaitDetailsList(stockWaitDetailsVos);