From 75de284687c6104143517e15a021bb7c0533464b Mon Sep 17 00:00:00 2001 From: zhangzq Date: Mon, 27 May 2024 16:07:18 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=87=BA=E5=BA=93=E5=8A=9F=E8=83=BD2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../out/iostor/IStIvtIostorinvOutService.java | 23 +++++ .../out/iostor/IStIvtIostorinvoutService.java | 16 ---- ...storinvout.java => StIvtIostorinvOut.java} | 26 ++---- .../views/wms/stor_manage/out/AddDialog.vue | 7 +- .../views/wms/stor_manage/out/TaskDialog.vue | 91 +++++++++++++++---- .../src/views/wms/stor_manage/out/index.vue | 8 +- .../views/wms/stor_manage/out/storinvout.js | 26 +++++- 7 files changed, 137 insertions(+), 60 deletions(-) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvOutService.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvoutService.java rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/{StIvtIostorinvout.java => StIvtIostorinvOut.java} (76%) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvOutService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvOutService.java new file mode 100644 index 00000000..9e183429 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvOutService.java @@ -0,0 +1,23 @@ +package org.nl.wms.stor_manage.io.service.out.iostor; + +import com.alibaba.fastjson.JSONObject; +import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn; +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut; + +/** + *

+ * 出入库单主表 服务类 + *

+ * + * @author generator + * @since 2024-03-28 + */ +public interface IStIvtIostorinvOutService extends IService { + + void save(JSONObject form); + + String dispense(JSONObject form); + + String canceldispense(JSONObject form); +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvoutService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvoutService.java deleted file mode 100644 index 3b6c97e2..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/IStIvtIostorinvoutService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.stor_manage.io.service.out.iostor; - -import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 出入库单主表 服务类 - *

- * - * @author generator - * @since 2024-03-28 - */ -public interface IStIvtIostorinvoutService extends IService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvout.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java similarity index 76% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvout.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java index 187ed87d..76ee7b6a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvout.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java @@ -33,17 +33,13 @@ public class StIvtIostorinvOut implements Serializable { /** * 出入类型 */ - private Boolean io_type; + private Boolean bill_type; - /** - * 业务日期 - */ - private String biz_date; /** * 生产区域编码 */ - private String product_code; + private String product_area; /** * 单据状态 @@ -55,30 +51,26 @@ public class StIvtIostorinvOut implements Serializable { */ private String remark; - /** - * 是否删除 - */ - private Boolean is_delete; - /** * 源单号 */ - private String source_code; + private String source_form_id; /** * 源单类型 */ - private String source_type; + private String source_form_type; /** - * 关联订单 + * 源单日期 */ - private String order; + private String source_form_date; + /** * 制单人 */ - private String create_id; + private String create_name; /** * 制单时间 @@ -88,7 +80,7 @@ public class StIvtIostorinvOut implements Serializable { /** * 修改人 */ - private String update_id; + private String update_name; /** * 修改时间 diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue index 73383277..40a0fac4 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue @@ -300,13 +300,8 @@ export default { data.source_form_id = '' data.unit_id = row.unit_id data.form_data = {} - let row_form_data = row.form_data; this.dtlCols.forEach(a=>{ - let item = '' - if (a.value in row_form_data) { - item = row_form_data[a.value]; - } - this.$set(data.form_data,a.value,item) + this.$set(data.form_data,a.value,'') }) this.tableData.splice(-1, 0, data) }) diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue index 227aea93..cbb15750 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue @@ -73,6 +73,7 @@ type="primary" icon="el-icon-plus" size="mini" + :disabled="!divflag" @click="divVehicle()" > 自动分配物料 @@ -83,7 +84,8 @@ type="primary" icon="el-icon-plus" size="mini" - @click="divVehicle()" + :disabled="divflag" + @click="divCancel()" > 取消分配 @@ -106,14 +108,11 @@ + - - - - + + @@ -122,7 +121,37 @@ - +
+ 作业明细 +
+ + + + + + + + + + + + + + + + + + + @@ -137,7 +166,7 @@ export default { components: { }, mixins: [crud()], dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'], - statusEnums: [ 'IOBILL_TYPE_OUT' ], + statusEnums: [ 'IOBILL_TYPE_OUT','FORM_STATUS' ], props: { dialogShow: { type: Boolean, @@ -157,10 +186,12 @@ export default { data() { return { dialogVisible: false, + divflag: false, cols: [], dtlCols: [], tableData: [], - currentDtl: {}, + tabledis: [], + currentDtl: null, form: { id: '', code: '', @@ -199,27 +230,55 @@ export default { setForm(row) { this.dialogVisible = true this.form = row + this.currentDtl = null crudProductout.getIosInvDtl(row.id).then(res => { this.tableData = res }) }, handleCurrentDtl(row){ this.currentDtl = row + if (this.currentDtl.struct_code != null){ + this.divflag = false; + }else { + this.divflag = true; + } + this.divdis(row) }, divVehicle() { - if (this.currentDtl === null) { + if (!this.currentDtl) { this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO) return } - crudProductout. + crudProductout.outDecision(this.currentDtl).then(res => { + crudProductout.getIosInvDtl(this.form.id).then(res => { + this.tableData = res + }) + }) + this.divdis(row) + }, + divCancel() { + if (!this.currentDtl) { + this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO) + return + } + crudProductout.cancelDecision(this.currentDtl).then(res => { + crudProductout.getIosInvDtl(this.form.id).then(res => { + this.tableData = res + }) + }) + this.divdis(row) + }, + divdis(row){ + crudProductout.divDis(row).then(res => { + this.tabledis = res.content + }) }, - - - - toDelete(data) { data.pop = true }, + formatStatus(row) { + return this.statusEnum.label.FORM_STATUS[row.task_status] + }, close() { this.form.tableMater = [] this.form.dtl_row = null diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/index.vue b/wms_pro/qd/src/views/wms/stor_manage/out/index.vue index 7479f148..29591013 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/index.vue @@ -97,7 +97,7 @@ :disabled="task_flag" @click="taskOpen" > - 作业任务 + 作业下发