出入库流水打印

hx-purchase/src/main/java/com/fjhx/purchase/service/MyPurchaseServiceImpl.java

@@ -2,13 +2,16 @@ package com.fjhx.purchase.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
 import com.fjhx.purchase.entity.sales.enums.SalesReturnDetailStatusEnum;
 import com.fjhx.purchase.entity.sales.po.SalesReturnDetail;
+import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.service.sales.SalesReturnDetailService;
+import com.fjhx.wms.entity.arrival.po.ArrivalDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchaseDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchasePo;
 import com.fjhx.wms.service.MyPurchaseService;
@@ -29,6 +32,8 @@ public class MyPurchaseServiceImpl implements MyPurchaseService {
     private PurchaseService purchaseService;
     @Autowired
     private PurchaseDetailService purchaseDetailService;
+    @Autowired
+    private ArrivalDetailService arrivalDetailService;
 
     /**
      * 修改采购退货状态
@@ -64,4 +69,11 @@ public class MyPurchaseServiceImpl implements MyPurchaseService {
         List<PurchaseDetailPo> purchaseDetailPos = BeanUtil.copyToList(purchaseDetailList, PurchaseDetailPo.class);
         return purchaseDetailPos.stream().collect(Collectors.toMap(PurchaseDetailPo::getId, Function.identity()));
     }
+
+    @Override
+    public ArrivalDetailPo getArrivalDetailInfo(Long id) {
+        ArrivalDetail arrivalDetail = arrivalDetailService.getById(id);
+        ArrivalDetailPo arrivalDetailPo = BeanUtil.copyProperties(arrivalDetail, ArrivalDetailPo.class);
+        return arrivalDetailPo;
+    }
 }

hx-sale/src/main/java/com/fjhx/sale/flow/PurchaseFlow.java

@@ -99,7 +99,7 @@ public class PurchaseFlow extends FlowDelegate {
             //修改申购明细的采购状态
             for (PurchaseDetail purchaseDetail : purchaseDetailList) {
                 //如果来源是申购
-                if (ObjectUtils.isEmpty(purchase.getDataResource())) {
+                if (ObjectUtils.isEmpty(purchaseDetail.getDataResource())) {
                     //计算已经采购的数量
                     List<PurchaseDetail> purchaseDetails = purchaseDetailService.list(q -> q
                             .eq(PurchaseDetail::getSubscribeDetailId, purchaseDetail.getSubscribeDetailId())

hx-wms/src/main/java/com/fjhx/wms/entity/arrival/po/ArrivalDetailPo.java

@@ -0,0 +1,58 @@
+package com.fjhx.wms.entity.arrival.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BasePo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 到货明细单
+ * </p>
+ *
+ * @author
+ * @since 2023-04-07
+ */
+@Getter
+@Setter
+@TableName("arrival_detail")
+public class ArrivalDetailPo extends BasePo {
+
+    /**
+     * 关联ID  产品ID/货品ID
+     */
+    private Long bussinessId;
+
+    /**
+     * 到货主表ID
+     */
+    private Long arrivalId;
+
+    /**
+     * 采购明细ID
+     */
+    private Long purchaseDetailId;
+
+    /**
+     * 到货数量
+     */
+    private BigDecimal count;
+
+    /**
+     * 质检状态 0未质检 10部分质检 20全部质检
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 发货明细id
+     */
+    private Long deliverGoodsDetailsId;
+
+}

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

@@ -1,5 +1,6 @@
 package com.fjhx.wms.service;
 
+import com.fjhx.wms.entity.arrival.po.ArrivalDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchaseDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchasePo;
 
@@ -21,4 +22,9 @@ public interface MyPurchaseService {
      * 获取采购明细
      */
     Map<Long, PurchaseDetailPo> grtPurchaseDetail(Long id);
+
+    /**
+     * 获取到货明细信息
+     */
+    ArrivalDetailPo getArrivalDetailInfo(Long id);
 }

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

@@ -10,6 +10,7 @@ import com.fjhx.customer.service.customer.CustomerService;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.supply.entity.supplier.po.SupplierInfo;
 import com.fjhx.supply.service.supplier.SupplierInfoService;
+import com.fjhx.wms.entity.arrival.po.ArrivalDetailPo;
 import com.fjhx.wms.entity.contract.po.ContractPo;
 import com.fjhx.wms.entity.purchase.po.PurchaseDetailPo;
 import com.fjhx.wms.entity.purchase.po.PurchasePo;
@@ -147,7 +148,11 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
                 if (ObjectUtils.isEmpty(stockWaitDetails)) {
                     continue;
                 }
-                PurchaseDetailPo purchaseDetail = purchaseDetailMap.get(stockWaitDetails.getBusinessDetailsId());
+                ArrivalDetailPo arrivalDetailInfo = myPurchaseService.getArrivalDetailInfo(stockWaitDetails.getBusinessDetailsId());
+                if (ObjectUtils.isEmpty(arrivalDetailInfo)) {
+                    continue;
+                }
+                PurchaseDetailPo purchaseDetail = purchaseDetailMap.get(arrivalDetailInfo.getPurchaseDetailId());
                 if (ObjectUtils.isEmpty(purchaseDetail)) {
                     continue;
                 }