【出库明细】 保存增加预估消耗和库存值

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetController.java

@@ -254,7 +254,6 @@ public class ChanjetController {
     public void synchronizeData() throws ChanjetApiException{
         //查询库存-现存量
         chanjetSchedule.queryStock();
-//        chanjetSchedule.queryProcessBom("SO-2024-07-0002");
         //创建入库
         chanjetSchedule.createStorageInOrder();
     }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storage/vo/StorageRespVO.java

@@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.biz.controller.admin.storage.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -103,4 +105,10 @@ public class StorageRespVO {
     @Schema(description = "生产订单Code")
     private String projectOrderCode;
 
+    @Schema(description = "库存")
+    private BigDecimal stockQuantity;
+
+    @Schema(description = "预估消耗")
+    private BigDecimal preAmount;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/storage/vo/StorageSaveReqVO.java

@@ -2,6 +2,8 @@ package com.chanko.yunxi.mes.module.biz.controller.admin.storage.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import javax.validation.constraints.*;
 import java.util.*;
@@ -73,4 +75,7 @@ public class StorageSaveReqVO {
     private String creator;
     private String updater;
 
+    private BigDecimal preAmount;
+    private BigDecimal stockQuantity;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/storagemat/StorageMatDO.java

@@ -84,8 +84,8 @@ public class StorageMatDO extends BaseDO {
     @TableField(exist = false)
     private String unit;
 
-    @TableField(exist = false)
-    @Schema(description = "库存数量")
     private BigDecimal stockQuantity;
 
+    private BigDecimal preAmount;
+
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java

@@ -133,19 +133,19 @@ public class StorageServiceImpl implements StorageService {
 
         }
 
-//        // 如为提交同步生成出库单
+        // 如为提交同步生成出库单
-//        if(updateObj.getStockType() == StockTypeEnum.OUT.getCode()){
+        if(updateObj.getStockType() == StockTypeEnum.OUT.getCode()){
-//
+
-//            // 逻辑变更：由提交状态改为审核状态时，通过用友接口推送出库单到TPlus
+            // 逻辑变更：由提交状态改为审核状态时，通过用友接口推送出库单到TPlus
-//            if(OperateTypeEnum.AUDIT.name().equals(updateReqVO.getActive())){
+            if(OperateTypeEnum.AUDIT.name().equals(updateReqVO.getActive())){
-//
+
-//                try {
+                try {
-//                    crossOrderManager.createStockOutOrder(updateObj.getId());
+                    crossOrderManager.createStockOutOrder(updateObj.getId());
-//                } catch (Exception e) {
+                } catch (Exception e) {
-//                    throw exception(CALL_API_ERROR);
+                    throw exception(CALL_API_ERROR);
-//                }
+                }
-//            }
+            }
-//        }
+        }
 
     }
 

sql/v1.0.0/2.business/1.structure.sql

@@ -472,3 +472,6 @@ alter table wms_storage add column `project_order_code` varchar(64) default null
 alter table wms_storage add column `material_mode` int(2) default null comment '领料模式';
 
 alter table project_sale_order add `package_status` int(2) default null comment '包装状态';
+
+alter table wms_storage_mat add column `pre_amount` decimal(10,2) DEFAULT NULL COMMENT '预估消耗值';
+alter table wms_storage_mat add column `stock_quantity` decimal(10,2) DEFAULT NULL COMMENT '库存';