diff --git a/wms/hd/nladmin-system/pom.xml b/wms/hd/nladmin-system/pom.xml
index a137437..f5df5d1 100644
--- a/wms/hd/nladmin-system/pom.xml
+++ b/wms/hd/nladmin-system/pom.xml
@@ -163,6 +163,11 @@
20.0
compile
+
+ com.hynnet
+ jxl
+ 2.6.12.1
+
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 cbfc6a5..e6aeb33 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
@@ -97,8 +97,11 @@ public class DumpInvTask extends AbstractAcsTask {
ivtObj.put("weight_unit_uuid", turnOutIvtObj.optString("weight_unit_uuid"));
//转出仓位扣减库存
- ivtService.addIvtFlow(ivtObj, IvtChangeTypeEnum.SUB_IVT_AND_CAN_USE);
- ivtObj.put("struct_uuid", dumpObj.optString("turnin_struct_uuid"));
+ /*ivtService.addIvtFlow(ivtObj, IvtChangeTypeEnum.SUB_IVT_AND_CAN_USE);
+ ivtObj.put("struct_uuid", dumpObj.optString("turnin_struct_uuid"));*/
+ WQLObject.getWQLObject("st_ivt_structIvt").delete("struct_uuid = '"+startPoint.getString("point_uuid")+"'");
+
+
//转入仓位加库存
ivtService.addIvtFlow(ivtObj, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE);
diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
index 76d88b9..8baca23 100644
--- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
+++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
@@ -85,7 +85,7 @@ public class OutTask extends AbstractAcsTask {
throw new BadRequestException("未找到可用点位:" + start_point_code);
}
paramIvt.put("struct_uuid", startPointDto.getPoint_uuid());
- ivtService.addIvtFlow(paramIvt, IvtChangeTypeEnum.SUB_IVT);
+ /* ivtService.addIvtFlow(paramIvt, IvtChangeTypeEnum.SUB_IVT);*/
//改变明细表的状态
String billdtl_uuid = disObj.optString("billdtl_uuid");
JSONObject dtljson = dtltable.query("billdtl_uuid='" + billdtl_uuid + "'").uniqueResult(0);
@@ -123,7 +123,7 @@ public class OutTask extends AbstractAcsTask {
nextpointObj.put("vehicle_code", taskjo.optString("vehicle_code"));
nextpointObj.put("label_uuid", disja.getJSONObject(0).optString("label_uuid"));
- nextpointObj.put("lock_type", taskjo.optString("00"));
+ nextpointObj.put("lock_type", "00");
pointTab.update(nextpointObj);
startPoint.put("lock_type", "00");
@@ -131,6 +131,9 @@ public class OutTask extends AbstractAcsTask {
startPoint.put("vehicle_code", "");
pointTab.update(startPoint);
+ //刪除庫存
+ WQLObject.getWQLObject("st_ivt_structIvt").delete("struct_uuid = '"+startPoint.getString("point_uuid")+"'");
+
}
WQLObject.getWQLObject("sch_base_task").update(taskjo);
diff --git a/wms/qd/src/views/wms/pdm/produceTask/index.vue b/wms/qd/src/views/wms/pdm/produceTask/index.vue
index f742170..b173956 100644
--- a/wms/qd/src/views/wms/pdm/produceTask/index.vue
+++ b/wms/qd/src/views/wms/pdm/produceTask/index.vue
@@ -143,8 +143,8 @@
label="加工托数"
:precision="0"
:step="1"
- :min="1"
- :max="99"
+ :min="0"
+ :max="form.ivt_qty"
/>