待出入库问题处理

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

@@ -545,6 +545,7 @@ public class ProduceOrderServiceImpl extends ServiceImpl<ProduceOrderMapper, Pro
         stockWait.setStatus(0);//待出库
         stockWait.setBusinessType(JournalType.PROD_OUT.getDetailType());//生产任务出库
         stockWait.setContractId(productionOrder.getContractId());
+        stockWait.setBusinessCode(productionOrder.getCode());
         stockWaitService.save(stockWait);
 
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();

hx-mes/src/main/java/com/fjhx/mes/service/report/impl/ReportLossesDetailsServiceImpl.java

@@ -9,11 +9,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
+import com.fjhx.mes.entity.production.po.ProductionOrder;
 import com.fjhx.mes.entity.report.dto.ReportLossesDetailsDto;
 import com.fjhx.mes.entity.report.dto.ReportLossesDetailsSelectDto;
 import com.fjhx.mes.entity.report.po.ReportLossesDetails;
 import com.fjhx.mes.entity.report.vo.ReportLossesDetailsVo;
 import com.fjhx.mes.mapper.report.ReportLossesDetailsMapper;
+import com.fjhx.mes.service.production.ProduceOrderService;
 import com.fjhx.mes.service.report.ReportLossesDetailsService;
 import com.fjhx.tenant.utils.DeptUstil;
 import com.fjhx.wms.entity.stock.emums.JournalType;
@@ -44,12 +46,18 @@ import java.util.stream.Collectors;
 @Service
 public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDetailsMapper, ReportLossesDetails> implements ReportLossesDetailsService {
 
+    private final ProductInfoService productInfoService;
+    private final StockWaitService stockWaitService;
+    private final StockWaitDetailsService stockWaitDetailsService;
+    private final ProduceOrderService produceOrderService;
+
     @Autowired
-    private ProductInfoService productInfoService;
-    @Autowired
-    private StockWaitService stockWaitService;
-    @Autowired
-    private StockWaitDetailsService stockWaitDetailsService;
+    public ReportLossesDetailsServiceImpl(ProductInfoService productInfoService, StockWaitService stockWaitService, StockWaitDetailsService stockWaitDetailsService, ProduceOrderService produceOrderService) {
+        this.productInfoService = productInfoService;
+        this.stockWaitService = stockWaitService;
+        this.stockWaitDetailsService = stockWaitDetailsService;
+        this.produceOrderService = produceOrderService;
+    }
 
     @Override
     public Page<ReportLossesDetailsVo> getPage(ReportLossesDetailsSelectDto dto) {
@@ -144,6 +152,9 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
 
         JournalType journalType = Objects.equals(dto.getType(), 1) ? JournalType.REPAIR_EXCEED_OUT : JournalType.LOSE_EXCEED_OUT;
 
+        Long prodOrderId = dto.getProdOrderId();
+        ProductionOrder productionOrder = produceOrderService.getById(prodOrderId);
+
         //生成待出库数据
         StockWait stockWait = new StockWait();
         stockWait.setCompanyId(SecurityUtils.getCompanyId());
@@ -151,6 +162,11 @@ public class ReportLossesDetailsServiceImpl extends ServiceImpl<ReportLossesDeta
         stockWait.setBusinessType(journalType.getDetailType());
         stockWait.setBusinessId(dto.getId());
         stockWait.setStatus(0);
+
+        if (ObjectUtil.isEmpty(productionOrder)) {
+            stockWait.setBusinessCode(productionOrder.getCode());
+        }
+
         stockWaitService.save(stockWait);
         StockWaitDetails stockWaitDetails = new StockWaitDetails();
         stockWaitDetails.setStockWaitId(stockWait.getId());

hx-wms/src/main/java/com/fjhx/wms/controller/stock/StockWaitController.java

@@ -51,20 +51,5 @@ public class StockWaitController {
     public void add(@RequestBody StockWaitDto stockWaitDto) {
         stockWaitService.add(stockWaitDto);
     }
-//    /**
-//     * 待出入库编辑
-//     */
-//    @PostMapping("/edit")
-//    public void edit(@RequestBody StockWaitDto stockWaitDto) {
-//        stockWaitService.edit(stockWaitDto);
-//    }
-//
-//    /**
-//     * 待出入库删除
-//     */
-//    @PostMapping("/delete")
-//    public void delete(@RequestBody BaseSelectDto dto) {
-//        stockWaitService.delete(dto.getId());
-//    }
 
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/JournalType.java

@@ -9,6 +9,10 @@ import lombok.Getter;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * 流水类型枚举
+ */
+
 @AllArgsConstructor
 @Getter
 public enum JournalType {

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

@@ -15,60 +15,9 @@ import java.util.List;
 @Getter
 @Setter
 public class StockWaitVo extends StockWait {
-
-//    /**
-//     * 商品id
-//     */
-//    private Long productId;
-//
-//    /**
-//     * 数量
-//     */
-//    private BigDecimal quantity;
-//
-//    /**
-//     * 已入库数量
-//     */
-//    private BigDecimal receiptQuantity;
-//
-//    /**
-//     * 商品名称
-//     */
-//    private String productName;
-//
-//    /**
-//     * 产品编码
-//     */
-//    private String productCode;
-//
-//    /**
-//     * 产品类型
-//     */
-//    private String productType;
-//
-//    /**
-//     * 规格型号
-//     */
-//    private String productSpec;
-//
-//    /**
-//     * 单位
-//     */
-//    private String productUnit;
-
     /**
      * 待入库明细
      */
     private List<StockWaitDetailsVo> stockWaitDetailsList;
 
-//    /**
-//     * 操作人名称
-//     */
-//    private String operatorName;
-//
-//    /**
-//     * 待出入库明细id
-//     */
-//    private Long stockWaitDetailsId;
-
 }

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

@@ -36,7 +36,7 @@
             sw.create_time,
             sw.update_user,
             sw.update_time,
-            sw.victoriatourist_json
+            sw.company_id
         FROM
             stock_wait sw
             ${ew.customSqlSegment}