问题处理

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

@@ -160,7 +160,7 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
             bomDetailList = BeanUtil.copyToList(workOrderBomList, BomDetail.class);
         } else {
             //查询BOM信息
-            BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()));
+            BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()).eq(BomInfo::getCurrentVersion,1));
             if (ObjectUtil.isEmpty(bomInfo)) {
                 throw new ServiceException("查询不到产品的BOM信息");
             }

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderBomServiceImpl.java

@@ -51,7 +51,7 @@ public class WorkOrderBomServiceImpl extends ServiceImpl<WorkOrderBomMapper, Wor
         List<WorkOrderBom> workOrderBomList = list(q -> q.eq(WorkOrderBom::getWorkOrderId, dto.getWorkOrderId()));
         if(ObjectUtil.isEmpty(workOrderBomList)){
             //如果不存在定制BOM就查询基本BOM信息
-            BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()));
+            BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrder.getProductId()).eq(BomInfo::getCurrentVersion,1));
             if(ObjectUtil.isEmpty(bomInfo)){
                 throw new ServiceException("查询不到产品基本BOM信息");
             }

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

@@ -2,6 +2,7 @@ package com.fjhx.wms.controller.stock;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.wms.entity.stock.vo.StockWaitVo;
@@ -64,8 +65,8 @@ public class StockWaitController {
      * 待出入库新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody StockWaitDto stockWaitDto) {
-        stockWaitService.add(stockWaitDto);
+    public void add(@RequestBody StockWaitDetailsDto stockWaitDetailsDto) {
+        stockWaitService.add(stockWaitDetailsDto);
     }
 
     /**

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

@@ -5,7 +5,6 @@ import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -28,7 +27,4 @@ public class StockWaitDto extends StockWait {
      */
     private List<StockWaitDetails> stockWaitDetailsList;
 
-    /**待入库数量*/
-    private BigDecimal quantity;
-
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockWaitDetails.java

@@ -1,18 +1,18 @@
 package com.fjhx.wms.entity.stock.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.math.BigDecimal;
-import java.util.Date;
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 待出入库明细
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-13
  */
 @Getter
@@ -45,11 +45,14 @@ public class StockWaitDetails extends BasePo {
      */
     private String victoriatouristJson;
 
-    /**业务明细id*/
-
+    /**
+     * 业务明细id
+     */
     private Long businessDetailsId;
 
-    /**采购数量*/
+    /**
+     * 采购数量
+     */
     private BigDecimal purchaseQuantity;
 
 }

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

@@ -1,6 +1,7 @@
 package com.fjhx.wms.service.stock;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
 import com.fjhx.wms.entity.stock.po.StockWait;
@@ -41,7 +42,7 @@ public interface StockWaitService extends BaseService<StockWait> {
     /**
      * 待出入库新增
      */
-    void add(StockWaitDto stockWaitDto);
+    void add(StockWaitDetailsDto stockWaitDetailsDto);
 
     /**
      * 待出入库新增 维多利亚

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

@@ -339,7 +339,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
      * 操作库存通用方法
      *
      * @param stockJournalId 出入库记录id
-     * @param type           1入库 2出库
+     * @param type           1入库 2出库 3维多利亚冻结库存入库
      */
     @Override
     public List<StockJournalDetails> ModifyInventory(Long stockJournalId, int type, List<Stock> list, Long warehouseId) {

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

@@ -15,7 +15,6 @@ import com.fjhx.wms.entity.arrival.po.ArrivalStockRecordsDetails;
 import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
-import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.*;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
@@ -32,11 +31,9 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -178,8 +175,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
 
     @DSTransactional
     @Override
-    public void add(StockWaitDto stockWaitDto) {
-        StockWaitDetailsDto stockWaitDetailsDto = BeanUtil.copyProperties(stockWaitDto, StockWaitDetailsDto.class);
+    public void add(StockWaitDetailsDto stockWaitDetailsDto) {
         stockWaitDetailsService.add(stockWaitDetailsDto);
     }
 
@@ -208,12 +204,6 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             if (stockWaitDetail.getReceiptQuantity().compareTo(stockWaitDetail.getQuantity()) == 0) {
                 statusFlag++;
             }
-
-            //操作库存
-//            Stock stock = new Stock();
-//            stock.setQuantity(stockWaitDto.getQuantity());
-//            stock.setProductId(stockWaitDetail.getProductId());
-//            stockList.add(stock);
         }
 
         //操作库存
@@ -233,8 +223,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             stockWait.setStatus(1);//部分入库
         }
         String victoriatouristJson = stockWait.getVictoriatouristJson();
-        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson)?JSONObject.parseObject(victoriatouristJson):new JSONObject();
-        json.put("receiptWarehouseId",stockWaitDto.getWarehouseId());
+        JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();
+        json.put("receiptWarehouseId", stockWaitDto.getWarehouseId());
         stockWait.setVictoriatouristJson(json.toJSONString());
         updateById(stockWait);
 
@@ -253,7 +243,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
 
         //如果是采购到货 创建待质检记录
-        if(stockWait.getBusinessType() == StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType()){
+        if (stockWait.getBusinessType() == StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType()) {
             //创建采购到货入库记录
             ArrivalStockRecords arrivalStockRecords = new ArrivalStockRecords();
             arrivalStockRecords.setStockWaitId(stockWait.getId());