diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageInsertReqVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageInsertReqVO.java
index 7cbca41..9200136 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageInsertReqVO.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageInsertReqVO.java
@@ -20,8 +20,10 @@ public class ProStorageInsertReqVO {
     private String storeAreCd;
     private String storeAreaName;
 
+    private Long sourceId;
+
     //退库信息
-    private BigDecimal returnQty;
-    private Integer returnBagQty;
+    private BigDecimal operatorQty;
+    private Integer bagQty;
 
 }
diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageRespVO.java
index 9e3a81d..daaf5b1 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageRespVO.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostorage/vo/ProStorageRespVO.java
@@ -24,11 +24,11 @@ public class ProStorageRespVO {
 
     @Schema(description = "操作类型 1为入库，2为出库", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty("操作类型 1为入库，2为出库")
-    private Boolean operatorType;
+    private String operatorType;
 
     @Schema(description = "业务类型 (10 生产入库，11  盘盈入库，12 其它入库   21 成品出库  22 盘亏出库  23生产退库)", example = "1")
     @ExcelProperty("业务类型 (10 生产入库，11  盘盈入库，12 其它入库   21 成品出库  22 盘亏出库  23生产退库)")
-    private Integer businessType;
+    private String businessType;
 
     @Schema(description = "备注", example = "你说的对")
     @ExcelProperty("备注")
@@ -36,7 +36,7 @@ public class ProStorageRespVO {
 
     @Schema(description = "状态：1 已创建；2 提交", example = "1")
     @ExcelProperty("状态：1 已创建；2 提交")
-    private Boolean status;
+    private String status;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/ProStorageMatController.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/ProStorageMatController.java
index a9f0586..b96cc68 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/ProStorageMatController.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/ProStorageMatController.java
@@ -9,7 +9,9 @@ import com.ningxia.yunxi.chemmes.framework.operatelog.core.annotations.OperateLo
 import com.ningxia.yunxi.chemmes.module.biz.controller.admin.prostoragemat.vo.ProStorageMatPageReqVO;
 import com.ningxia.yunxi.chemmes.module.biz.controller.admin.prostoragemat.vo.ProStorageMatRespVO;
 import com.ningxia.yunxi.chemmes.module.biz.controller.admin.prostoragemat.vo.ProStorageMatSaveReqVO;
+import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.prostorageinventory.ProStorageInventoryDO;
 import com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.prostoragemat.ProStorageMatDO;
+import com.ningxia.yunxi.chemmes.module.biz.service.prostorageinventory.ProStorageInventoryService;
 import com.ningxia.yunxi.chemmes.module.biz.service.prostoragemat.ProStorageMatService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -36,6 +38,8 @@ public class ProStorageMatController {
 
     @Resource
     private ProStorageMatService proStorageMatService;
+    @Resource
+    private ProStorageInventoryService proStorageInventoryService;
 
     @PostMapping("/create")
     @Operation(summary = "创建成品入/出库子")
@@ -76,7 +80,13 @@ public class ProStorageMatController {
     @PreAuthorize("@ss.hasPermission('twm:pro-storage-mat:query')")
     public CommonResult<List<ProStorageMatRespVO>> getProStorageMatByStockId(@RequestParam("stockId") Integer stockId) {
         List<ProStorageMatDO> proStorageMatByStockId = proStorageMatService.getProStorageMatByStockId(stockId);
-        return success(BeanUtils.toBean(proStorageMatByStockId, ProStorageMatRespVO.class));
+        List<ProStorageMatRespVO> bean = BeanUtils.toBean(proStorageMatByStockId, ProStorageMatRespVO.class);
+        for (ProStorageMatRespVO matRespVO : bean) {
+            ProStorageInventoryDO storageInventoryDO = proStorageInventoryService.selectByMat(matRespVO.getStoreHouseCd(), matRespVO.getStoreAreCd(), matRespVO.getLotNo(), matRespVO.getMatCode());
+            matRespVO.setYardQty(storageInventoryDO.getYardQty());
+            matRespVO.setPackQty(storageInventoryDO.getPackQty());
+        }
+        return success(bean);
     }
 
     @GetMapping("/page")
diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/vo/ProStorageMatRespVO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/vo/ProStorageMatRespVO.java
index 0444adc..e510b27 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/vo/ProStorageMatRespVO.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/controller/admin/prostoragemat/vo/ProStorageMatRespVO.java
@@ -105,4 +105,8 @@ public class ProStorageMatRespVO {
     @ExcelProperty("生产计划号")
     private String proNo;
 
+    private String inventBillNo;
+    private BigDecimal yardQty;
+    private Integer packQty;
+
 }
diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/prostorage/ProStorageServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/prostorage/ProStorageServiceImpl.java
index 3b138c1..f610f0a 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/prostorage/ProStorageServiceImpl.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/prostorage/ProStorageServiceImpl.java
@@ -2,6 +2,7 @@ package com.ningxia.yunxi.chemmes.module.biz.service.prostorage;
 
 import com.ningxia.yunxi.chemmes.framework.common.pojo.PageResult;
 import com.ningxia.yunxi.chemmes.framework.common.util.CodeGenerateUtils;
+import com.ningxia.yunxi.chemmes.framework.common.util.object.BeanUtils;
 import com.ningxia.yunxi.chemmes.framework.security.core.util.SecurityFrameworkUtils;
 import com.ningxia.yunxi.chemmes.module.biz.controller.admin.prostorage.vo.ProStorageInsertReqVO;
 import com.ningxia.yunxi.chemmes.module.biz.controller.admin.prostorage.vo.ProStoragePageReqVO;
@@ -49,11 +50,12 @@ public class ProStorageServiceImpl implements ProStorageService {
     private final AdminUserService adminUserService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Integer createProStorage(ProStorageSaveReqVO createReqVO) {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         AdminUserDO user = adminUserService.getUser(loginUserId);
         String nickname = user.getNickname();
-        ProStorageDO proStorage = saveProStorage(23, loginUserId, nickname, "", null, createReqVO.getRemark());
+        ProStorageDO proStorage = saveProStorage(23, createReqVO.getStatus(), loginUserId, nickname, "", null, createReqVO.getRemark());
 
         saveMat(createReqVO, proStorage);
 
@@ -67,7 +69,7 @@ public class ProStorageServiceImpl implements ProStorageService {
     private void process(ProStorageDO proStorage, Long loginUserId, String nickname) {
         List<ProStorageMatDO> proStorageMatDOS = proStorageMatMapper.selectByStockId(proStorage.getId());
         for (ProStorageMatDO proStorageMatDO : proStorageMatDOS) {
-            ProStorageInventoryDO storageInventoryDO = proStorageInventoryService.getProStorageInventory(Long.valueOf(proStorageMatDO.getId()));
+            ProStorageInventoryDO storageInventoryDO = proStorageInventoryService.getProStorageInventory(proStorageMatDO.getSourceId());
             storageInventoryDO.setYardQty(storageInventoryDO.getYardQty().subtract(proStorageMatDO.getOperatorQty()));
             storageInventoryDO.setPackQty(storageInventoryDO.getPackQty() - proStorageMatDO.getBagQty());
             proStorageInventoryMapper.updateById(storageInventoryDO);
@@ -139,7 +141,7 @@ public class ProStorageServiceImpl implements ProStorageService {
         String nickname = user.getNickname();
         for (ProStorageInsertReqVO createReqVO : reqVOS) {
             ProPackDO proPackDO = proPackMapper.selectById(createReqVO.getId());
-            ProStorageDO proStorage = saveProStorage(10, loginUserId, nickname, proPackDO.getPackNo(), proPackDO.getId(), "");
+            ProStorageDO proStorage = saveProStorage(10, "2", loginUserId, nickname, proPackDO.getPackNo(), proPackDO.getId(), "");
             ProStorageInventoryDO storageInventoryDO = svaeStorageInventory(createReqVO, proPackDO);
             saveLog(createReqVO, proStorage, proPackDO, storageInventoryDO, loginUserId, nickname);
             proPackDO.setPackStatus("3");
@@ -187,14 +189,14 @@ public class ProStorageServiceImpl implements ProStorageService {
     }
 
     @NotNull
-    private ProStorageDO saveProStorage(Integer businessType, Long loginUserId, String nickname,
+    private ProStorageDO saveProStorage(Integer businessType, String status, Long loginUserId, String nickname,
                                         String relationNo, Integer relationId, String remark) {
         ProStorageDO proStorage = new ProStorageDO();
         proStorage.setBillNo(generateBillNo("2"));
         proStorage.setOperatorType(2);
         proStorage.setBusinessType(businessType);
         proStorage.setRemark(remark);
-        proStorage.setStatus(2);
+        proStorage.setStatus(Integer.valueOf(status));
         proStorage.setBillDate(LocalDate.now());
         proStorage.setOperatorId(loginUserId);
         proStorage.setOperatorName(nickname);
@@ -268,14 +270,17 @@ public class ProStorageServiceImpl implements ProStorageService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateProStorage(ProStorageSaveReqVO updateReqVO) {
         Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
         AdminUserDO user = adminUserService.getUser(loginUserId);
         String nickname = user.getNickname();
-        ProStorageDO proStorage = saveProStorage(23, loginUserId, nickname, "", null, updateReqVO.getRemark());
+        ProStorageDO proStorage = BeanUtils.toBean(updateReqVO, ProStorageDO.class);
+        proStorage.setOperatorId(loginUserId);
+        proStorage.setOperatorName(nickname);
+        proStorageMapper.updateById(proStorage);
         proStorageMatMapper.deleteByStockId(proStorage.getId());
         saveMat(updateReqVO, proStorage);
-
         if ("2".equals(updateReqVO.getStatus())) {
             process(proStorage, loginUserId, nickname);
         }
@@ -283,7 +288,7 @@ public class ProStorageServiceImpl implements ProStorageService {
 
     private void saveMat(ProStorageSaveReqVO updateReqVO, ProStorageDO proStorage) {
         for (ProStorageInsertReqVO detail : updateReqVO.getDetails()) {
-            ProStorageInventoryDO storageInventoryDO = proStorageInventoryService.getProStorageInventory(Long.valueOf(detail.getId()));
+            ProStorageInventoryDO storageInventoryDO = proStorageInventoryService.getProStorageInventory(detail.getSourceId());
             ProStorageMatDO proStorageMat = new ProStorageMatDO();
             proStorageMat.setStockId(proStorage.getId());
             proStorageMat.setDescription("");
@@ -299,11 +304,12 @@ public class ProStorageServiceImpl implements ProStorageService {
             proStorageMat.setSpec(storageInventoryDO.getSpec());
             proStorageMat.setUnit(storageInventoryDO.getUnit());
             proStorageMat.setLotNo(storageInventoryDO.getLotNo());
-            proStorageMat.setOperatorQty(detail.getReturnQty());
-//            proStorageMat.setSourceId(0L);
+            proStorageMat.setOperatorQty(detail.getOperatorQty());
+            proStorageMat.setBagSpec(storageInventoryDO.getBagSpec());
+            proStorageMat.setSourceId(Long.valueOf(detail.getSourceId()));
 //            proStorageMat.setRelarionId(0);
 //            proStorageMat.setBagSpec(0);
-//            proStorageMat.setBagQty(0);
+            proStorageMat.setBagQty(detail.getBagQty());
 //            proStorageMat.setProNo("");
             proStorageMat.setInventBillNo(storageInventoryDO.getInventBillNo());
             proStorageMatMapper.insert(proStorageMat);
@@ -311,11 +317,13 @@ public class ProStorageServiceImpl implements ProStorageService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteProStorage(Integer id) {
         // 校验存在
         validateProStorageExists(id);
         // 删除
         proStorageMapper.deleteById(id);
+        proStorageMatMapper.deleteByStockId(id);
     }
 
     private void validateProStorageExists(Integer id) {
diff --git a/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts b/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts
index 57ff30a..7a2ca4e 100644
--- a/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts
+++ b/mes-ui/mes-ui-admin-vue3/src/types/auto-components.d.ts
@@ -129,6 +129,7 @@ declare module 'vue' {
     VerifyPoints: typeof import('./../components/Verifition/src/Verify/VerifyPoints.vue')['default']
     VerifySlide: typeof import('./../components/Verifition/src/Verify/VerifySlide.vue')['default']
     VerticalButtonGroup: typeof import('./../components/VerticalButtonGroup/index.vue')['default']
+    'Workspace.xml': typeof import('./../../.idea/workspace.xml.tmp')['default']
     XButton: typeof import('./../components/XButton/src/XButton.vue')['default']
     XTextButton: typeof import('./../components/XButton/src/XTextButton.vue')['default']
   }
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/ProReturnForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/ProReturnForm.vue
index cdbb798..e05169c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/ProReturnForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/ProReturnForm.vue
@@ -113,18 +113,18 @@
           </el-table-column>
           <el-table-column label="库存数量" min-width="100px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.stockQty || 0 }}</span>
+              <span>{{ scope.row.yardQty || 0 }}</span>
             </template>
           </el-table-column>
           <el-table-column label="库存袋数" min-width="100px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.stockBagQty || 0 }}</span>
+              <span>{{ scope.row.packQty || 0 }}</span>
             </template>
           </el-table-column>
           <el-table-column label="退库数量(*)" min-width="120px" align="center">
             <template #default="scope">
               <el-input 
-                v-model="scope.row.returnQty" 
+                v-model="scope.row.operatorQty" 
                 placeholder="手动录入"
                 :disabled="formType === 'detail'"
                 class="bg-yellow-100"
@@ -135,7 +135,7 @@
           <el-table-column label="退库袋数(*)" min-width="120px" align="center">
             <template #default="scope">
               <el-input 
-                v-model="scope.row.returnBagQty" 
+                v-model="scope.row.bagQty" 
                 placeholder="手动录入"
                 :disabled="formType === 'detail'"
                 class="bg-yellow-100"
@@ -144,37 +144,37 @@
           </el-table-column>
           <el-table-column label="仓储名称" min-width="120px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.storeHouseName || '-' }}</span>
+              <span>{{ scope.row.storeHouseName  }}</span>
             </template>
           </el-table-column>
           <el-table-column label="库区名称" min-width="120px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.storeAreaName || '-' }}</span>
+              <span>{{ scope.row.storeAreaName  }}</span>
             </template>
           </el-table-column>
           <el-table-column label="单位" min-width="80px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.unit || '-' }}</span>
+              <span>{{ scope.row.unit  }}</span>
             </template>
           </el-table-column>
           <el-table-column label="产品编码" min-width="120px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.productCode || '-' }}</span>
+              <span>{{ scope.row.productCode  }}</span>
             </template>
           </el-table-column>
           <el-table-column label="单袋规格" min-width="100px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.bagSpec || '-' }}</span>
+              <span>{{ scope.row.bagSpec  }}</span>
             </template>
           </el-table-column>
           <el-table-column label="生产计划号" min-width="120px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.planNo || '-' }}</span>
+              <span>{{ scope.row.planNo  }}</span>
             </template>
           </el-table-column>
           <el-table-column label="存货账单号" min-width="120px" align="center">
             <template #default="scope">
-              <span>{{ scope.row.stockBillNo || '-' }}</span>
+              <span>{{ scope.row.inventBillNo  }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" min-width="80px" align="center" fixed="right">
@@ -255,20 +255,21 @@ const handleInventorySelect = (selectedInventory: any[]) => {
     selectedInventory.forEach(inventory => {
       detailList.value.push({
         id: inventory.id,
+        sourceId: inventory.id, // 来源ID
         productName: inventory.matName,
         spec: inventory.spec,
         lotNo: inventory.lotNo,
-        stockQty: inventory.yardQty,
-        stockBagQty: inventory.packQty,
-        returnQty: undefined,
-        returnBagQty: undefined,
+        yardQty: inventory.yardQty,
+        packQty: inventory.packQty,
+        operatorQty: undefined,
+        bagQty: undefined,
         storeHouseName: inventory.storeHouseName,
         storeAreaName: inventory.storeAreaName,
         unit: inventory.unit,
         productCode: inventory.matCode,
         bagSpec: inventory.bagSpec,
         planNo: inventory.planNo,
-        stockBillNo: inventory.inventBillNo,
+        inventBillNo: inventory.inventBillNo,
         materialId: inventory.materialId,
         storeHouseId: inventory.storeHouseId,
         storeAreaId: inventory.storeAreaId,
@@ -325,10 +326,26 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const loadDetailList = async (stockId: number) => {
   try {
     const data = await ProStorageMatApi.getProStorageMatPageByStockId(stockId)
-    detailList.value = (data.list || []).map(item => ({
-      ...item,
-      returnQty: item.operatorQty, // 退库数量
-      returnBagQty: item.bagQty, // 退库袋数
+    detailList.value = (data || []).map(item => ({
+      id: item.id,
+      productName: item.matName, // 产品名称
+      productCode: item.matCode, // 产品编码
+      spec: item.spec, // 规格型号
+      lotNo: item.lotNo, // 批次号
+      yardQty: item.yardQty, // 库存数量
+      packQty: item.packQty, // 库存袋数
+      operatorQty: item.operatorQty, // 退库数量
+      bagQty: item.bagQty, // 退库袋数
+      storeHouseName: item.storeHouseName, // 仓储名称
+      storeAreaName: item.storeAreaName, // 库区名称
+      unit: item.unit, // 单位
+      bagSpec: item.bagSpec, // 单袋规格
+      planNo: item.proNo, // 生产计划号
+      materialId: item.materialId,
+      storeHouseId: item.storeHouseId,
+      storeAreaId: item.storeAreaId,
+      inventBillNo: item.inventBillNo, // 存货账单号
+      sourceId: item.sourceId, // 来源ID
     }))
   } catch (error) {
     console.error('加载明细列表失败:', error)
@@ -374,11 +391,11 @@ const submitForm = async (action: string) => {
   // 校验必填字段
   for (let i = 0; i < detailList.value.length; i++) {
     const row = detailList.value[i]
-    if (!row.returnQty) {
+    if (!row.operatorQty) {
       message.error(`第${i + 1}行退库数量不能为空`)
       return
     }
-    if (!row.returnBagQty) {
+    if (!row.bagQty) {
       message.error(`第${i + 1}行退库袋数不能为空`)
       return
     }
@@ -390,9 +407,9 @@ const submitForm = async (action: string) => {
     const submitData = {
       ...formData.value,
       details: detailList.value.map(item => ({
-        id: item.id,
-        returnQty: item.returnQty, // 退库数量
-        returnBagQty: item.returnBagQty, // 退库袋数
+        operatorQty: item.operatorQty, // 退库数量
+        bagQty: item.bagQty, // 退库袋数
+        sourceId: item.sourceId, // 来源ID
       })),
     }
     
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/index.vue
index 896c12f..b9ce50d 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/proreturn/index.vue
@@ -91,6 +91,7 @@
               type="primary"
               @click="openForm('update', scope.row.id)"
               v-hasPermi="['twm:storage:update']"
+              v-if="scope.row.status === '1'"
             >
               编辑
             </el-button>
@@ -106,6 +107,7 @@
               type="danger"
               @click="handleDelete(scope.row.id)"
               v-hasPermi="['twm:storage:delete']"
+              v-if="scope.row.status === '1'"
             >
               删除
             </el-button>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storagemat/StorageMatForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storagemat/StorageMatForm.vue
deleted file mode 100644
index 799d77e..0000000
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storagemat/StorageMatForm.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="110px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="入/出库Id" prop="stockId">
-        <el-input v-model="formData.stockId" placeholder="请输入入/出库Id" />
-      </el-form-item>
-      <el-form-item label="备注" prop="description">
-        <Editor v-model="formData.description" height="150px" />
-      </el-form-item>
-      <el-form-item label="仓储id" prop="storeHouseId">
-        <el-input v-model="formData.storeHouseId" placeholder="请输入仓储id" />
-      </el-form-item>
-      <el-form-item label="库区id" prop="storeAreaId">
-        <el-input v-model="formData.storeAreaId" placeholder="请输入库区id" />
-      </el-form-item>
-      <el-form-item label="仓储编码" prop="storeHouseCd">
-        <el-input v-model="formData.storeHouseCd" placeholder="请输入仓储编码" />
-      </el-form-item>
-      <el-form-item label="仓储名称" prop="storeHouseName">
-        <el-input v-model="formData.storeHouseName" placeholder="请输入仓储名称" />
-      </el-form-item>
-      <el-form-item label="库区编码" prop="storeAreCd">
-        <el-input v-model="formData.storeAreCd" placeholder="请输入库区编码" />
-      </el-form-item>
-      <el-form-item label="库区名称" prop="storeAreaName">
-        <el-input v-model="formData.storeAreaName" placeholder="请输入库区名称" />
-      </el-form-item>
-      <el-form-item label="物料id" prop="materialId">
-        <el-input v-model="formData.materialId" placeholder="请输入物料id" />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="matName">
-        <el-input v-model="formData.matName" placeholder="请输入物料名称" />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="matCode">
-        <el-input v-model="formData.matCode" placeholder="请输入物料编码" />
-      </el-form-item>
-      <el-form-item label="规格型号" prop="spec">
-        <el-input v-model="formData.spec" placeholder="请输入规格型号" />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input v-model="formData.unit" placeholder="请输入单位" />
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input v-model="formData.lotNo" placeholder="请输入批次号" />
-      </el-form-item>
-      <el-form-item label="操作数量" prop="operatorQty">
-        <el-input v-model="formData.operatorQty" placeholder="请输入操作数量" />
-      </el-form-item>
-      <el-form-item label="采购数量" prop="purQty">
-        <el-input v-model="formData.purQty" placeholder="请输入采购数量" />
-      </el-form-item>
-      <el-form-item label="来源数量" prop="sourceQty">
-        <el-input v-model="formData.sourceQty" placeholder="请输入来源数量" />
-      </el-form-item>
-      <el-form-item label="来源单号id" prop="sourceId">
-        <el-input v-model="formData.sourceId" placeholder="请输入来源单号id" />
-      </el-form-item>
-      <el-form-item label="关联单号id" prop="relarionId">
-        <el-input v-model="formData.relarionId" placeholder="请输入关联单号id" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script setup lang="ts">
-import * as StorageMatApi from '@/api/twm/storagemat'
-import { watch } from 'vue'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  id: undefined,
-  stockId: undefined,
-  description: undefined,
-  storeHouseId: undefined,
-  storeAreaId: undefined,
-  storeHouseCd: undefined,
-  storeHouseName: undefined,
-  storeAreCd: undefined,
-  storeAreaName: undefined,
-  materialId: undefined,
-  matName: undefined,
-  matCode: undefined,
-  spec: undefined,
-  unit: undefined,
-  lotNo: undefined,
-  operatorQty: undefined,
-  purQty: undefined,
-  sourceQty: undefined,
-  sourceId: undefined,
-  relarionId: undefined,
-})
-/** 弹窗关闭时通知父组件 */
-watch(dialogVisible, (val) => {
-  if (!val) {
-    emit('close')
-  }
-})
-
-const formRules = reactive({
-  stockId: [{ required: true, message: '入/出库Id不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
-
-/** 打开弹窗 */
-const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await StorageMatApi.getStorageMat(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success', 'close']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formData.value as unknown as StorageMatApi.StorageMatVO
-    if (formType.value === 'create') {
-      await StorageMatApi.createStorageMat(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await StorageMatApi.updateStorageMat(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    stockId: undefined,
-    description: undefined,
-    storeHouseId: undefined,
-    storeAreaId: undefined,
-    storeHouseCd: undefined,
-    storeHouseName: undefined,
-    storeAreCd: undefined,
-    storeAreaName: undefined,
-    materialId: undefined,
-    matName: undefined,
-    matCode: undefined,
-    spec: undefined,
-    unit: undefined,
-    lotNo: undefined,
-    operatorQty: undefined,
-    purQty: undefined,
-    sourceQty: undefined,
-    sourceId: undefined,
-    relarionId: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>
\ No newline at end of file
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/storagemat/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/storagemat/index.vue
deleted file mode 100644
index b72ed4d..0000000
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/storagemat/index.vue
+++ /dev/null
@@ -1,375 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="80px"
-    >
-      <el-form-item label="入/出库Id" prop="stockId">
-        <el-input
-          v-model="queryParams.stockId"
-          placeholder="请输入入/出库Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="仓储id" prop="storeHouseId">
-        <el-input
-          v-model="queryParams.storeHouseId"
-          placeholder="请输入仓储id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="库区id" prop="storeAreaId">
-        <el-input
-          v-model="queryParams.storeAreaId"
-          placeholder="请输入库区id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="仓储编码" prop="storeHouseCd">
-        <el-input
-          v-model="queryParams.storeHouseCd"
-          placeholder="请输入仓储编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="仓储名称" prop="storeHouseName">
-        <el-input
-          v-model="queryParams.storeHouseName"
-          placeholder="请输入仓储名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="库区编码" prop="storeAreCd">
-        <el-input
-          v-model="queryParams.storeAreCd"
-          placeholder="请输入库区编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="库区名称" prop="storeAreaName">
-        <el-input
-          v-model="queryParams.storeAreaName"
-          placeholder="请输入库区名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="物料id" prop="materialId">
-        <el-input
-          v-model="queryParams.materialId"
-          placeholder="请输入物料id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="物料名称" prop="matName">
-        <el-input
-          v-model="queryParams.matName"
-          placeholder="请输入物料名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="物料编码" prop="matCode">
-        <el-input
-          v-model="queryParams.matCode"
-          placeholder="请输入物料编码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="规格型号" prop="spec">
-        <el-input
-          v-model="queryParams.spec"
-          placeholder="请输入规格型号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="单位" prop="unit">
-        <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="批次号" prop="lotNo">
-        <el-input
-          v-model="queryParams.lotNo"
-          placeholder="请输入批次号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="操作数量" prop="operatorQty">
-        <el-input
-          v-model="queryParams.operatorQty"
-          placeholder="请输入操作数量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="采购数量" prop="purQty">
-        <el-input
-          v-model="queryParams.purQty"
-          placeholder="请输入采购数量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="来源数量" prop="sourceQty">
-        <el-input
-          v-model="queryParams.sourceQty"
-          placeholder="请输入来源数量"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="来源单号id" prop="sourceId">
-        <el-input
-          v-model="queryParams.sourceId"
-          placeholder="请输入来源单号id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="关联单号id" prop="relarionId">
-        <el-input
-          v-model="queryParams.relarionId"
-          placeholder="请输入关联单号id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['twm:storage-mat:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['twm:storage-mat:export']"
-        >
-          <Icon icon="ep:download" class="mr-5px" /> 导出
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="序号" align="center" type="index" width="60px"/>
-      <el-table-column label="入/出库Id" align="center" prop="stockId" />
-      <el-table-column label="备注" align="center" prop="description" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="仓储id" align="center" prop="storeHouseId" />
-      <el-table-column label="库区id" align="center" prop="storeAreaId" />
-      <el-table-column label="仓储编码" align="center" prop="storeHouseCd" />
-      <el-table-column label="仓储名称" align="center" prop="storeHouseName" />
-      <el-table-column label="库区编码" align="center" prop="storeAreCd" />
-      <el-table-column label="库区名称" align="center" prop="storeAreaName" />
-      <el-table-column label="物料id" align="center" prop="materialId" />
-      <el-table-column label="物料名称" align="center" prop="matName" />
-      <el-table-column label="物料编码" align="center" prop="matCode" />
-      <el-table-column label="规格型号" align="center" prop="spec" />
-      <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="批次号" align="center" prop="lotNo" />
-      <el-table-column label="操作数量" align="center" prop="operatorQty" />
-      <el-table-column label="采购数量" align="center" prop="purQty" />
-      <el-table-column label="来源数量" align="center" prop="sourceQty" />
-      <el-table-column label="来源单号id" align="center" prop="sourceId" />
-      <el-table-column label="关联单号id" align="center" prop="relarionId" />
-      <el-table-column label="操作" align="center">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['twm:storage-mat:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['twm:storage-mat:delete']"
-          >
-            删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <StorageMatForm ref="formRef" @success="getList" @close="handleQuery"/>
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import * as StorageMatApi from '@/api/twm/storagemat'
-import StorageMatForm from './StorageMatForm.vue'
-
-defineOptions({ name: 'StorageMat' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(false) // 列表的加载中（默认不加载）
-const list = ref([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  stockId: undefined,
-  description: undefined,
-  createTime: [],
-  storeHouseId: undefined,
-  storeAreaId: undefined,
-  storeHouseCd: undefined,
-  storeHouseName: undefined,
-  storeAreCd: undefined,
-  storeAreaName: undefined,
-  materialId: undefined,
-  matName: undefined,
-  matCode: undefined,
-  spec: undefined,
-  unit: undefined,
-  lotNo: undefined,
-  operatorQty: undefined,
-  purQty: undefined,
-  sourceQty: undefined,
-  sourceId: undefined,
-  relarionId: undefined,
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await StorageMatApi.getStorageMatPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
-
-/** 添加/修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await StorageMatApi.deleteStorageMat(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await StorageMatApi.exportStorageMat(queryParams)
-    download.excel(data, '入/出库物料.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  // 默认不自动查询，需手动点击搜索按钮
-})
-</script>
\ No newline at end of file