diff --git a/wms/hd/doc/承厚四方游泳康复生产基地AGV智能物流项目技术协议210517s.pdf b/wms/hd/doc/承厚四方游泳康复生产基地AGV智能物流项目技术协议210517s.pdf deleted file mode 100644 index 67fc7b0..0000000 Binary files a/wms/hd/doc/承厚四方游泳康复生产基地AGV智能物流项目技术协议210517s.pdf and /dev/null differ diff --git a/wms/hd/nladmin-system/pom.xml b/wms/hd/nladmin-system/pom.xml index ce2cacf..feff8ee 100644 --- a/wms/hd/nladmin-system/pom.xml +++ b/wms/hd/nladmin-system/pom.xml @@ -198,6 +198,9 @@ **/*.* + + **/*.java + ${basedir}/src/main/resources diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java index d3007ba..5b8e9b9 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java @@ -106,8 +106,13 @@ public class DumpInvTask extends AbstractAcsTask { ivtObj.put("vehicle_code", turnOutIvtObj.optString("vehicle_code")); ivtObj.put("qty_unit_uuid", turnOutIvtObj.optString("qty_unit_uuid")); ivtObj.put("weight_unit_uuid", turnOutIvtObj.optString("weight_unit_uuid")); + + //先删除入的库存 + WQLObject.getWQLObject("st_ivt_structIvt").delete("struct_uuid = '"+dumpObj.optString("turnin_struct_uuid")+"'"); //转入仓位加库存 ivtService.addIvtFlow(ivtObj, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE); + + } } diff --git a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml index b7106b9..c3a0f3c 100644 --- a/wms/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -106,7 +106,7 @@ https://juejin.cn/post/6844903775631572999 - + diff --git a/wms/qd/src/views/wms/pdm/produceTask/bigScreen.vue b/wms/qd/src/views/wms/pdm/produceTask/bigScreen.vue index d68ea64..cb8d54e 100644 --- a/wms/qd/src/views/wms/pdm/produceTask/bigScreen.vue +++ b/wms/qd/src/views/wms/pdm/produceTask/bigScreen.vue @@ -144,6 +144,7 @@ export default { }) }, finish() { + debugger if (this.$refs.table.selection.length === 0) { this.notify('请选中一条记录!', 'info') return @@ -151,7 +152,7 @@ export default { // 判断是否有完工<加工,弹出提示 for (const i in this.$refs.table.selection) { console.log(this.$refs.table.selection[i]) - if (this.$refs.table.selection[i].finishproduce_qty < this.$refs.table.selection[i].produce_qty) { + if (this.$refs.table.selection[i].finishproduce_qty <= this.$refs.table.selection[i].produce_qty) { this.$confirm('完工数量小于加工数量,是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消',