From 21623980d321eee67a841742895e776cf7e087dc Mon Sep 17 00:00:00 2001 From: Ledo Date: Fri, 10 Jan 2025 08:37:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/storage/StorageController.java | 8 ++++++- .../admin/storage/vo/StorageSaveReqVO.java | 3 ++- .../storagemat/vo/StorageMatSaveReqVO.java | 2 ++ .../dataobject/storagemat/StorageMatDO.java | 2 +- .../service/storagelog/StorageLogService.java | 2 +- .../storagelog/StorageLogServiceImpl.java | 5 ++++- .../storagemat/StorageMatServiceImpl.java | 22 +++++++++---------- .../processbom/ProcessBomDetailMapper.xml | 5 +---- .../src/views/heli/storage/StorageOut.vue | 22 ++++++++++++------- .../src/views/heli/storage/StorageOutsp.vue | 21 +++++++++++++----- .../src/views/heli/storage/materials.vue | 1 - .../src/views/heli/storage/outdexsp.vue | 2 +- 12 files changed, 59 insertions(+), 36 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java index 0a70509..efe6369 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java @@ -103,7 +103,7 @@ public class StorageController { // 获取最新的出入库信息 StorageDO targetDo = storageService.getStorage(updateReqVO.getId()); - int beforeStatus = targetDo.getStatus(); + int beforeStatus = updateReqVO.getBeforeStatus(); targetDo.setStatus(updateReqVO.getStatus()); @@ -123,6 +123,7 @@ public class StorageController { storageService.updateStorage(updateReqVO); int status = targetDo.getStatus(); + //状态说明：1保存 2提交 3作废 4已审批 if(updateReqVO.getStockType() == 2){ //盘亏出库以外直接出 if(updateReqVO.getStockInType() != 3){ @@ -133,10 +134,15 @@ public class StorageController { }else if (updateReqVO.getStatus() == 4){ //如果是从已提交改为已审核就是要出库了 status = 2; + }else if ((beforeStatus == 1 || beforeStatus == 2) && updateReqVO.getStatus() == 3){ + //如果是已提交状态被作废了不需要还原库存 + return success(true); } else if (beforeStatus == 4 && updateReqVO.getStatus() == 3){ //如果是已审核改为作废，要还原库存 status = 3; + storageLogService.deleteByStockId(targetDo.getId()); + return success(true); } } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java index 2b91185..1aec35c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageSaveReqVO.java @@ -67,5 +67,6 @@ public class StorageSaveReqVO { private String projectSubName; @Schema(description = "子项目id", example = "你说的对") private String projectNo; - + @Schema(description = "提交前的状态", example = "提交前的状态") + private Integer beforeStatus; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java index 83a0a8a..ae3ae4a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storagemat/vo/StorageMatSaveReqVO.java @@ -48,4 +48,6 @@ public class StorageMatSaveReqVO { @Schema(description = "备注", example = "你猜") private BigDecimal amount; + @Schema(description = "备注", example = "你猜") + private String projectSubName; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java index b50838f..6cb072b 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storagemat/StorageMatDO.java @@ -94,7 +94,7 @@ public class StorageMatDO extends BaseDO { @TableField(exist = false) private String unit; - @TableField(exist = false) +// @TableField(exist = false) private String projectSubName; @TableField(exist = false) private String pickmode; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java index aefe2ed..e198941 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogService.java @@ -47,7 +47,7 @@ public interface StorageLogService { * @return 入/出库日志 */ StorageLogDO getStorageLog(Long id); - + int deleteByStockId(Long stockId); /** * 获得入/出库日志分页 * diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java index 73c1a0a..522c380 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagelog/StorageLogServiceImpl.java @@ -86,7 +86,10 @@ public class StorageLogServiceImpl implements StorageLogService { public StorageLogDO getStorageLog(Long id) { return storageLogMapper.selectById(id); } - + @Override + public int deleteByStockId(Long stockId){ + return storageLogMapper.delete(StorageLogDO::getStockId,stockId); + } @Override public PageResult getStorageLogPage(StorageLogPageReqVO pageReqVO) { return storageLogAllMapper.selectPage(pageReqVO); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java index 5f95791..27b5edb 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/storagemat/StorageMatServiceImpl.java @@ -246,17 +246,17 @@ public class StorageMatServiceImpl implements StorageMatService { } StorageLogNowDO storageLogNowDO = storageLogNowMapper.selectOne(queryWrapper); storageMatDO.setMatRest(storageLogNowDO.getStorageOkQty()); - if(storageMatDO.getProjectSubName()!=null && !storageMatDO.getProjectSubName().equals("")){ - if(subNameMap.get(storageMatDO.getProjectNo())!=null){ - storageMatDO.setProjectSubName(subNameMap.get(storageMatDO.getProjectNo())); - }else{ - ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(storageMatDO.getProjectNo()); - storageMatDO.setProjectSubName(projectOrderSubDO.getName()); - subNameMap.put(storageMatDO.getProjectNo(),projectOrderSubDO.getName()); - } - - - } +// if(storageMatDO.getProjectSubName()!=null && !storageMatDO.getProjectSubName().equals("")){ +// if(subNameMap.get(storageMatDO.getProjectNo())!=null){ +// storageMatDO.setProjectSubName(subNameMap.get(storageMatDO.getProjectNo())); +// }else{ +// ProjectOrderSubDO projectOrderSubDO = projectOrderSubMapper.selectById(storageMatDO.getProjectNo()); +// storageMatDO.setProjectSubName(projectOrderSubDO.getName()); +// subNameMap.put(storageMatDO.getProjectNo(),projectOrderSubDO.getName()); +// } +// +// +// } } } return storageMatDOS; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomDetailMapper.xml b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomDetailMapper.xml index ada8abd..a8e4b1d 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomDetailMapper.xml +++ b/mes-module-heli/mes-module-heli-biz/src/main/resources/mapper/processbom/ProcessBomDetailMapper.xml @@ -52,14 +52,11 @@ INNER JOIN pro_process_bom ppb ON pbd.bom_id = ppb.id WHERE - ppb.project_sub_id = #{param2} + ppb.project_sub_id = #{param2} and pbd.bom_id = #{param1} AND pbd.material_id IS NOT NULL ) ORDER BY t.id DESC; - - - diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue index 2cba60f..74c2ebd 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue @@ -374,8 +374,8 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete" 存 提 交 - + 作 + 废 @@ -442,7 +442,8 @@ const formData = ref({ cancel: undefined, cancelTime: undefined, matItemDOList: [], - attachments: [] + attachments: [], + beforeStatus:1, }) const formRules = reactive({ @@ -1108,9 +1109,8 @@ const initStatus = async (status) => { ctrSave.value = false ctrCancel.value = true ctrDelete.value = false - btnSave.value = true - btnCancel.value = false + btnCancel.value = true break case 2: ctrView.value = false @@ -1118,7 +1118,7 @@ const initStatus = async (status) => { ctrCancel.value = false ctrDelete.value = true btnSave.value = false - btnCancel.value = true + btnCancel.value = false break case 3: ctrView.value = true @@ -1129,7 +1129,7 @@ const initStatus = async (status) => { btnCancel.value = false break case 4: - btnCancel.value = false + btnCancel.value = true default: break } @@ -1141,7 +1141,12 @@ const initStatus = async (status) => { ctrDelete.value = true btnSave.value = false - btnCancel.value = false + if(formData.value.status == 4){ + btnCancel.value = true; + }else{ + btnCancel.value = false + } + } } const matList = ref([]) // 物料列表 @@ -1239,6 +1244,7 @@ onMounted(async () => { handleStockType(formData.value.stockInType); //用户信息，用于底部数据展示 userList.value = await UserApi.getSimpleUserList() + formData.value.beforeStatus = formData.value.status; }) //接收物料传递的数据 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue index f2054d0..c9bc8ee 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOutsp.vue @@ -362,9 +362,9 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete" 存 提 交 - 作 + 作 废 - 审核 + 审核 @@ -428,7 +428,8 @@ const formData = ref({ cancel: undefined, cancelTime: undefined, matItemDOList: [], - attachments: [] + attachments: [], + beforeStatus:undefined, }) const formRules = reactive({ @@ -1041,6 +1042,7 @@ const initStatus = async (status) => { ctrDelete.value = true btnSave.value = false btnCancel.value = false + btnok.value=false break case 4: ctrView.value = true @@ -1048,7 +1050,7 @@ const initStatus = async (status) => { ctrCancel.value = true ctrDelete.value = false btnSave.value = false - btnCancel.value = false + btnCancel.value = true btnok.value=false break default: @@ -1060,9 +1062,15 @@ const initStatus = async (status) => { ctrSave.value = true ctrCancel.value = true ctrDelete.value = true - btnSave.value = false - btnCancel.value = false + btnok.value=false + console.log('ss'+formData.value.status) + if(formData.value.status == 4){ + btnCancel.value = true + }else{ + btnCancel.value = false + } + } } const matList = ref([]) // 物料列表 @@ -1156,6 +1164,7 @@ onMounted(async () => { //用户信息，用于底部数据展示 userList.value = await UserApi.getSimpleUserList() + formData.value.beforeStatus = formData.value.status; }) //接收物料传递的数据 diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue index c420207..d0327e0 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/materials.vue @@ -132,7 +132,6 @@ const getList = async () => { }) }else if(formType.value == 'bomfind'){ - debugger dataone = await ProcessBomApi.getProcessBomDetailListByBomIdbyid(queryReqVo.whId.projectNo) dataone = dataone.filter(item => item.whId === queryReqVo.whId.whId); // 将过滤后的数据赋值给datatow diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdexsp.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdexsp.vue index cf64320..1620672 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdexsp.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdexsp.vue @@ -172,7 +172,7 @@