From 3e04b66e057dfac7176fc8101985d879a3f89d38 Mon Sep 17 00:00:00 2001 From: zxy Date: Thu, 15 Jan 2026 16:37:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E6=96=99=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=B3=E5=85=A5=E5=8D=B3=E5=87=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/storage/vo/StorageRespVO.java | 6 ++- .../admin/storage/vo/StorageSaveReqVO.java | 2 + .../dal/dataobject/storage/StorageDO.java | 7 +++- .../src/views/heli/storage/StorageForm.vue | 39 ++++++++++++------- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java index 77c46a9c..1dafb639 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/vo/StorageRespVO.java @@ -110,4 +110,8 @@ public class StorageRespVO { @Schema(description = "上游单号id") private Long headerId; -} \ No newline at end of file + @Schema(description = "即入即出标志") + @ExcelProperty("即入即出标志 1 是：0不是") + private Boolean inOutFlag; + +} 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 3b65b126..eca538ec 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 @@ -85,4 +85,6 @@ public class StorageSaveReqVO { private Long pnId; private List matItemDOList; + private Boolean inOutFlag; + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java index 33487f01..5bc882df 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/storage/StorageDO.java @@ -13,6 +13,7 @@ import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.chanko.yunxi.mes.framework.mybatis.core.dataobject.BaseDO; +import org.apache.ibatis.type.JdbcType; /** * 入/出库 DO @@ -115,6 +116,10 @@ public class StorageDO extends BaseDO { private Integer pickmode; private Integer pickcar; private Integer projectNo; + + @TableField(jdbcType = JdbcType.BOOLEAN) + private Boolean inOutFlag; + @TableField(exist = false) private String materialCode; @TableField(exist = false) @@ -143,4 +148,4 @@ public class StorageDO extends BaseDO { private Long headerId; @TableField(exist = false) private String type; -} \ No newline at end of file +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue index 512d3258..3443f8b4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue @@ -92,11 +92,16 @@ v-model="formData.whId" placeholder="下拉选择" clearable class="!w-400px" @c - + + + + + + + type="textarea" v-model="formData.description" show-word-limit maxlength="200" + :disabled="ctrView || ctrSave"/> @@ -111,10 +116,9 @@ type="textarea" v-model="formData.description" show-word-limit maxlength="200" - 新增 - + 新增物料 @@ -309,14 +313,10 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete" @@ -367,6 +367,8 @@ link type="primary" size="small" :disabled="ctrView || ctrDelete" + +
@@ -486,6 +488,7 @@ import materials1 from './materialsin1.vue' import projects from './subproject.vue' import {Search} from "@element-plus/icons-vue"; import purchaseorderDialog from '@/views/heli/outsourcestock/purchaseorderDialog.vue' +import MaterialForm from '@/views/heli/material/MaterialForm.vue' import * as StorageinApi from "@/api/heli/storagein"; import * as storageInventoryApi from "@/api/heli/storageinventory"; @@ -518,6 +521,7 @@ const formData = ref({ matItemDOList: [], attachments: [], headerId:undefined, + inOutFlag: true, }) const formRules = reactive({ // name: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }], @@ -544,8 +548,9 @@ const queryParams = reactive({ whId: undefined, }) const matOpenFormRef = ref() -const proOpenFormRef = ref() const matOpenFormRef1 = ref() +const proOpenFormRef = ref() +const materialOpenFormRef = ref() const openMatForm = () => { // if (formData.value.whId == undefined || formData.value.whId == '') { @@ -560,6 +565,10 @@ const openMatForm = () => { matOpenFormRef.value.open(formData.value.whId,'in') } } + +const openPnForm = () => { + materialOpenFormRef.value.open("create") +} // const isPrint = async () => { // var newVar = await StorageApi.isPrint(query.id); // console.log(newVar)