Merge remote-tracking branch 'origin/master'

hx-item/src/main/java/com/fjhx/item/entity/product/po/ProductInfo.java

@@ -6,6 +6,8 @@ import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 产品库
@@ -92,4 +94,9 @@ public class ProductInfo extends BasePo {
      */
     private String barCode;
 
+    /**
+     * 结存单价
+     */
+    private BigDecimal unitPrice;
+
 }

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -20,7 +20,8 @@
             pi.update_time,
             pi.victoriatourist_json,
             pi.bar_code,
-            IF(DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.growUpDay' ),3,IF( DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.newProductsDay' ), 2, 1 )) AS lifeCycle
+            IF(DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.growUpDay' ),3,IF( DATEDIFF(now(),pi.create_time)> json_unquote( victoriatourist_json -> '$.newProductsDay' ), 2, 1 )) AS lifeCycle,
+            pi.unit_price
         FROM
             product_info pi
             ${ew.customSqlSegment}

hx-jxst/src/main/java/com/fjhx/jxst/flow/SalesContractFlow.java

@@ -23,7 +23,6 @@ public class SalesContractFlow extends FlowDelegate {
     private SalesContractDetailsService salesContractDetailsService;
     @Autowired
     private WorkOrderService workOrderService;
-
     @Override
     public String getFlowKey() {
         return "jxst_sales_contract_flow";
@@ -33,6 +32,7 @@ public class SalesContractFlow extends FlowDelegate {
     public Long start(Long flowId, JSONObject submitData) {
         SalesContractDto salesContractDto = submitData.toJavaObject(SalesContractDto.class);
         salesContractDto.setFlowId(flowId);
+        salesContractDto.setFlowKey(getFlowKey());
         salesContractService.add(salesContractDto);
         return salesContractDto.getId();
     }

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

@@ -127,14 +127,19 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         workOrderDto.setCode(CodeEnum.WORK_ORDER.getCode());
         workOrderDto.setStatus(0);
         this.save(workOrderDto);
+        //获取产品信息
+        ProductInfo productInfo = productInfoService.getById(workOrderDto.getProductId());
+        if(ObjectUtil.isEmpty(productInfo)){
+            throw new ServiceException("查询不到产品信息 产品id->" + workOrderDto.getProductId());
+        }
         //搜索BOM明细并到冻结库存
         BomInfo bomInfo = bomInfoService.getOne(q -> q.eq(BomInfo::getProductId, workOrderDto.getProductId()));
         if (ObjectUtil.isEmpty(bomInfo)) {
-            throw new ServiceException("查询不到产品的BOM信息");
+            throw new ServiceException("查询不到产品的BOM信息 产品名称->"+productInfo.getName());
         }
         List<BomDetail> bomDetailList = bomDetailService.list(q -> q.eq(BomDetail::getBomInfoId, bomInfo.getId()));
         if (ObjectUtil.isEmpty(bomDetailList)) {
-            throw new ServiceException("查询不到BOM明细");
+            throw new ServiceException("查询不到产品BOM明细 产品名称->"+productInfo.getName());
         }
         List<Long> productIds = bomDetailList.stream().map(BomDetail::getProductId).collect(Collectors.toList());
         Map<Long, List<Stock>> productMap = stockService.mapKGroup(Stock::getProductId, q -> q.in(Stock::getProductId, productIds));

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

@@ -40,14 +40,4 @@ public class Stock extends BasePo {
      */
     private String victoriatouristJson;
 
-    /**
-     * 冻结库存
-     */
-    private BigDecimal frozenQuantity;
-
-    /**
-     * 结存单价
-     */
-    private BigDecimal unitPrice;
-
 }

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

@@ -99,5 +99,10 @@ public class StockVo extends Stock {
      */
     private BigDecimal defectiveQuantity;
 
+    /**
+     * 结存单价
+     */
+    private BigDecimal unitPrice;
+
 
 }

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

@@ -81,6 +81,8 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             item.setProductSpec(productInfo.getSpec());
             item.setProductClassifyId(productInfo.getProductClassifyId());
             item.setProductDefinition(productInfo.getDefinition());
+            //赋值结存单价
+            item.setUnitPrice(productInfo.getUnitPrice());
         });
         //赋值产品分类
         productClassifyService.attributeAssign(stockVos, StockVo::getProductClassifyId, (item, productClassify) -> {
@@ -358,10 +360,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 //判断传操作的库存是否为空 空赋值0
                 stock.setQuantity(BigDecimal.ZERO);
             }
-            if (ObjectUtil.isEmpty(stock.getFrozenQuantity())) {
-                //判断传操作的冻结库存是否为空 空赋值0
-                stock.setFrozenQuantity(BigDecimal.ZERO);
-            }
             newStocks.setQuantity(stock.getQuantity());
 
             //合并库存数量
@@ -369,7 +367,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             //用来存储操作数据
             if (ObjectUtil.isNotEmpty(oldStocks)) {
                 BigDecimal quantity = oldStocks.getQuantity();
-                BigDecimal oldFrozenQuantity = oldStocks.getFrozenQuantity();
                 if (type == 1) {
                     //入库库存相加
                     quantity = quantity.add(stock.getQuantity());
@@ -379,10 +376,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                     if (quantity.compareTo(BigDecimal.ZERO) < 0) {
                         throw new ServiceException("库存不足无法出库");
                     }
-                    oldFrozenQuantity = oldFrozenQuantity.subtract(stock.getFrozenQuantity());
-                    if (oldFrozenQuantity.compareTo(BigDecimal.ZERO) < 0) {
-                        throw new ServiceException("冻结库存不足无法出库");
-                    }
                 } else if (type == 3) {
                     //维多利亚入库增加冻结库存
                     String victoriatouristJson = oldStocks.getVictoriatouristJson();
@@ -397,7 +390,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 }
                 newStocks.setId(oldStocks.getId());
                 newStocks.setQuantity(quantity);
-                newStocks.setFrozenQuantity(oldFrozenQuantity);
             } else if (type == 2) {
                 ProductInfo productInfo = productInfoService.getById(stock.getProductId());
                 if (productInfo == null) {

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

@@ -12,9 +12,7 @@
             s.create_time,
             s.update_user,
             s.update_time,
-            s.victoriatourist_json,
-            s.unit_price,
-            s.frozen_quantity
+            s.victoriatourist_json
         FROM
             stock s
                 LEFT JOIN bytesailing_item.product_info pi ON s.product_id = pi.id