合同变更修改

hx-common/src/main/java/com/fjhx/common/entity/AvailableStockBo.java

@@ -29,4 +29,9 @@ public class AvailableStockBo {
      */
     private BigDecimal inStockQuantity;
 
+    /**
+     * 需采购量
+     */
+    private BigDecimal demandPurchaseCount;
+
 }

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -441,20 +441,24 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                 //后>前 可用=可用-（后-前）
                 if (newQuantity.compareTo(inOutBo.getQuantity()) > 0) {
                     BigDecimal subtract = newQuantity.subtract(inOutBo.getQuantity());
-                    availableQuantity = availableQuantity.subtract(subtract);
 
                     //计数需要采购的数量(需采购量 = 安全库存 - （可用库存 - 合同量）若 需采购量<0，则按0算不采购)
                     BigDecimal subtract1 = availableQuantity.subtract(subtract);
                     BigDecimal requiredQuantity = stockThreshold.subtract(subtract1);
                     inOutBo.setNewQuantity(requiredQuantity);
 
+
+                    //修改可用库存
+                    availableQuantity = availableQuantity.subtract(subtract);
+
+
                 }
                 //后<前
                 else if (newQuantity.compareTo(inOutBo.getQuantity()) < 0) {
 
-                    //后>已采购 可用=可用-（后-前+已采）
+                    //后>已采购 可用=可用-（后-前-已采+原需采购（数据库中的））
                     if (newQuantity.compareTo(inOutBo.getInStockQuantity()) > 0) {
-                        BigDecimal subtract = newQuantity.subtract(inOutBo.getQuantity()).subtract(inOutBo.getInStockQuantity());
+                        BigDecimal subtract = newQuantity.subtract(inOutBo.getQuantity()).subtract(inOutBo.getInStockQuantity()).add(inOutBo.getDemandPurchaseCount());
 
                         //计算可用库存
                         availableQuantity = availableQuantity.subtract(subtract);
@@ -467,9 +471,6 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                         availableQuantity = availableQuantity.add(subtract);
                     }
 
-                    if (availableQuantity.compareTo(BigDecimal.ZERO) < 0) {
-                        availableQuantity = BigDecimal.ZERO;
-                    }
 
                     //需采购量直接为0
                     inOutBo.setNewQuantity(BigDecimal.ZERO);
@@ -479,6 +480,11 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
                 throw new ServiceException("未知操作类型,请联系管理员！");
             }
 
+            //可用库存
+            if (availableQuantity.compareTo(BigDecimal.ZERO) < 0) {
+                availableQuantity = stockThreshold;
+            }
+
             //保存可用库存
             BigDecimal finalAvailableQuantity = availableQuantity;
             productStockInfoService.update(q -> q

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

@@ -261,6 +261,15 @@ public class ContractUpdateFlow extends FlowDelegate {
             //已采购数量
             BigDecimal purchaseQuantity = collect.getOrDefault(materialId, BigDecimal.ZERO);
 
+            //获取原需采购量
+            SubscribeDetail subscribeDetail = subscribeDetailService.getOne(q -> q.eq(SubscribeDetail::getContractId, oldContractId)
+                    .eq(SubscribeDetail::getProductId, materialId)
+            );
+            BigDecimal demandPurchaseCount = BigDecimal.ZERO;
+            if (ObjectUtils.isNotEmpty(subscribeDetail)) {
+                demandPurchaseCount = subscribeDetail.getCount();
+            }
+
 
             //生成操作可用库存的实体
             AvailableStockBo availableStockBo = new AvailableStockBo();
@@ -268,37 +277,10 @@ public class ContractUpdateFlow extends FlowDelegate {
             availableStockBo.setQuantity(oldContractProductBom.getQuantity());
             availableStockBo.setNewQuantity(newQuantity);
             availableStockBo.setInStockQuantity(purchaseQuantity);
+            availableStockBo.setDemandPurchaseCount(demandPurchaseCount);
 
             availableStockBoList.add(availableStockBo);
 
-
-//            //操作待采购数据
-//            SubscribeDetail subscribeDetail = subscribeDetailService.getOne(q -> q.eq(SubscribeDetail::getContractId, oldContractId)
-//                    .eq(SubscribeDetail::getProductId, materialId)
-//            );
-//            if (ObjectUtils.isEmpty(newQuantity)) {
-//                //原数据被删，检查已采购数量
-//                if (ObjectUtils.isEmpty(purchaseQuantity)) {
-//                    subscribeDetailService.removeById(subscribeDetail);
-//                } else {
-//                    subscribeDetailService.update(q -> q
-//                            .eq(SubscribeDetail::getContractId, oldContractId)
-//                            .eq(SubscribeDetail::getProductId, materialId)
-//                            .set(SubscribeDetail::getCount, BigDecimal.ZERO)
-//                    );
-//                }
-//            } else {
-//                subscribeDetail.setCount(newQuantity);
-//
-//                //计算状态
-//                int status = purchaseQuantity.compareTo(newQuantity) >= 0 ? 20 : 30;
-//                if (purchaseQuantity.compareTo(BigDecimal.ZERO) == 0) {
-//                    status = 15;
-//                }
-//                subscribeDetail.setStatus(status);
-//                subscribeDetailService.updateById(subscribeDetail);
-//            }
-
         }
 
         //新添加的数据处理
@@ -318,18 +300,9 @@ public class ContractUpdateFlow extends FlowDelegate {
             availableStockBo.setQuantity(null);
             availableStockBo.setNewQuantity(newPurchaseProduct.getQuantity());
             availableStockBo.setInStockQuantity(null);
-            availableStockBoList.add(availableStockBo);
-
+            availableStockBo.setDemandPurchaseCount(BigDecimal.ZERO);
 
-//            //生成待采购
-//            SubscribeDetail subscribeDetail = new SubscribeDetail();
-//            subscribeDetail.setProductId(materialId);
-//            subscribeDetail.setCount(newPurchaseProduct.getQuantity());
-//            subscribeDetail.setStatus(15);//待采购
-//            subscribeDetail.setContractId(oldContractId);
-//            subscribeDetail.setDataType(1);
-//            subscribeDetail.setCompanyId(oldContract.getCompanyId());
-//            subscribeDetailService.save(subscribeDetail);
+            availableStockBoList.add(availableStockBo);
         }
 
 
@@ -347,15 +320,9 @@ public class ContractUpdateFlow extends FlowDelegate {
 
             BigDecimal requiredQuantity = availableStockBo.getNewQuantity();
 
-            //需采购=已采购 虚采购量=0
-            if (requiredQuantity.compareTo(availableStockBo.getInStockQuantity()) == 0 && requiredQuantity.compareTo(BigDecimal.ZERO) == 0) {
-                if (ObjectUtils.isNotEmpty(subscribeDetail)) {
-                    subscribeDetailService.removeById(subscribeDetail);
-                }
-            }
 
             //需采购量>0
-            else if (requiredQuantity.compareTo(BigDecimal.ZERO) > 0) {
+            if (requiredQuantity.compareTo(BigDecimal.ZERO) > 0) {
                 if (ObjectUtils.isEmpty(subscribeDetail)) {
                     //生成待采购
                     subscribeDetail = new SubscribeDetail();
@@ -379,6 +346,11 @@ public class ContractUpdateFlow extends FlowDelegate {
                 subscribeDetail.setStatus(status);
 
                 subscribeDetailService.saveOrUpdate(subscribeDetail);
+            } else {
+                //需采购==0不显示或删除,<不存在
+                if (ObjectUtils.isNotEmpty(subscribeDetail)) {
+                    subscribeDetailService.removeById(subscribeDetail);
+                }
             }