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 fc11b434..b2684e2d 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
@@ -158,6 +158,10 @@ public class StorageController {
}
updateReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class);
+ //出库即审核
+ if (updateReqVO.getStockType() == 2) {
+ updateReqVO.setStatus(4);
+ }
storageService.updateStorage(updateReqVO);
int status = targetDo.getStatus();
StorageSaveReqVO saveReqVO;
@@ -265,7 +269,7 @@ public class StorageController {
}
}
storageService.updateLogList(targetDo.getId(),status,targetDo.getStockType(),targetDo.getStockNo());
- if (saveReqVO.getInOutFlag()){
+ if (saveReqVO.getInOutFlag() != null && saveReqVO.getInOutFlag()) {
//增加出库日志
storageService.updateLogList(targetDo.getId(), saveReqVO.getStatus(), saveReqVO.getStockType(), saveReqVO.getStockNo());
}
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue
index 90a35587..35f2ceb8 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/outdex.vue
@@ -127,6 +127,13 @@
{{ warehouseList.find((tag) => tag.id === scope.row.whId)?.whName }}
+
+
+
+ {{ scope.row.inOutFlag ? '是' : '否' }}
+
+
+
{{ userList.find((user) => user.id === scope.row.materialReceiver)?.nickname }}
@@ -180,9 +187,13 @@
编辑
+
+
+
查看详情
+