盘点库存 自动生成出入库单，备注=由盘点单号【】生成

盘点库存 自动生成出入库单，备注=由盘点单号【】生成

mes-module-heli/mes-module-heli-api/src/main/java/com/chanko/yunxi/mes/module/heli/enums/CodeEnum.java

@@ -40,7 +40,7 @@ public enum CodeEnum {
     WAREHOUSE("仓库", "Wa", 4),
     STOCK_IN("入库单", "WI", 4, "yyyyMMdd"),
     STOCK_OUT("出库单", "WO", 4, "yyyyMMdd"),
-    STOCK_CHECK("盘点单据", "WC", 3, "yyyyMMdd"),
+    STOCK_CHECK("盘点单据", "WC", 3, "yyyyMM"),
     PROJECT_ORDER("业务订单", 3, "yyyyMM"),
     PROJECT_DELIVERY_ORDER("发货单", "HL", 3, "yyyyMM"),
     ;

mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagecheck/StorageCheckServiceImpl.java

@@ -131,21 +131,21 @@ public class StorageCheckServiceImpl implements StorageCheckService {
 
         if(hasStockIn>0){
             // 库存类型为入库
-            saveStorage(storageCheckDO,1);
+            saveStorage(storageCheckDO,1,2);
         }
         if(hasStockOut>0){
             // 库存类型为出库
-            saveStorage(storageCheckDO,2);
+            saveStorage(storageCheckDO,2,3);
         }
         return true;
     }
-    private void saveStorage(StorageCheckDO storageCheckDO,Integer stockType){
+    private void saveStorage(StorageCheckDO storageCheckDO,Integer stockType,Integer stockInType){
 
         LocalDateTime current = LocalDateTime.now();
         // 库存类型为stockType
         StorageDO storageDO = new StorageDO();
         storageDO.setStockType(stockType);
-        storageDO.setStockInType(1);
+        storageDO.setStockInType(stockInType);
         storageDO.setStockNo(UUID.fastUUID().toString(true));
         storageDO.setHeaderNo(storageCheckDO.getStockNo());
         storageDO.setStatus(2);
@@ -155,6 +155,8 @@ public class StorageCheckServiceImpl implements StorageCheckService {
         storageDO.setKeeperTime(current);
         storageDO.setOutbound(storageCheckDO.getKeeper());
         storageDO.setOutboundTime(current);
+        storageDO.setDescription("由盘点单号"+storageCheckDO.getStockNo()+"产生");
+
 
         storageMapper.insert(storageDO);
         storageDO.setStockNo(STOCK_IN.getCode(storageDO.getId().toString()));
@@ -175,7 +177,7 @@ public class StorageCheckServiceImpl implements StorageCheckService {
             storageMatDO.setWhId(item.getWhId());
             storageMatDO.setRgId(item.getRgId());
             storageMatDO.setPnId(item.getPnId());
-            storageMatDO.setStorageOkQty(item.getStorageOkQty());
+            storageMatDO.setStorageOkQty(item.getStorageOkQty().subtract(item.getMatRest()));
             storageMatDO.setLotNo(item.getLotNo());
 
             // 插入出入库物料表

mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/checkdetail.vue

@@ -687,7 +687,6 @@ onMounted(async () => {
 
   formData.value.matItemDOList.forEach((item) => {
     var matFind = dataMatSimples.find((simp) => simp.id == item.matId)
-    item.cid = matCount
     item.isCopy = 0
     item.matName = matFind?.name
     item.matCode = matFind?.code
@@ -698,10 +697,14 @@ onMounted(async () => {
     item.shortName = matFind?.short_name
     item.matSub = item.storageOkQty - item.matRest
     item.pnlist = pnList.value.filter((pn) => pn.rg_id == item.rgId)
+  })
 
+  formData.value.matItemDOList.sort((a,b)=>a.matCode-b.matCode)
+  formData.value.matItemDOList.forEach(item=>{
+    item.cid = matCount
     matCount= matCount+1
-  })
 
+  })
   // 附件信息
   let attParams = {
     pageNo: 1,