diff --git a/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentContainerSelectModal.vue b/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentContainerSelectModal.vue
index 34d4d56..997b53d 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentContainerSelectModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentContainerSelectModal.vue
@@ -67,7 +67,11 @@ export default {
},
confirmLoading: false,
- validatorRules: {},
+ validatorRules: {
+ toPort: [
+ {required: true, message: '请输入出库口!'},
+ ],
+ },
url: {
createTask: "/shipment/shipmentContainerHeader/createShipmentTask",
}
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentDetailCombineModal.vue b/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentDetailCombineModal.vue
index 8f2e465..552d3eb 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentDetailCombineModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/modules/ShipmentDetailCombineModal.vue
@@ -14,17 +14,17 @@
<a-row>
<a-col :span="24">
<a-form-model-item label="物料编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialCode">
- <a-input v-model="model.materialCode" placeholder="请输入物料编码" style="width: 100%" />
+ <a-input disabled="disabled" v-model="model.materialCode" placeholder="请输入物料编码" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="物料名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="materialName">
- <a-input v-model="model.materialName" placeholder="请输入物料名称" style="width: 100%" />
+ <a-input disabled="disabled" v-model="model.materialName" placeholder="请输入物料名称" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="可出数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
- <a-input-number v-model="model.qty" placeholder="请输入可出数量" style="width: 100%" />
+ <a-form-model-item label="可出数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qty">
+ <a-input disabled="disabled" v-model="model.qty" placeholder="请输入可出数量" style="width: 100%" />
</a-form-model-item>
</a-col>
<a-col :span="24">
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailChildServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailChildServiceImpl.java
index 9e55ca9..4dbe7f3 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailChildServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailChildServiceImpl.java
@@ -88,7 +88,7 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl<CycleCountDeta
detailChild1.setGapQty(adjQty);
detailChild1.setCountedQty(qty);
detailChild1.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_REGISTERED);
- if (!this.updateById(detailChild)) {
+ if (!this.updateById(detailChild1)) {
throw new JeecgBootException("实盘登记更新盘点子单数量失败");
}
@@ -130,16 +130,16 @@ public class CycleCountDetailChildServiceImpl extends ServiceImpl<CycleCountDeta
}
TaskDetail taskDetail = new TaskDetail();
- taskDetail.setId(Integer.parseInt(id));
+ taskDetail.setId(detailChild.getTaskDetailId());
taskDetail.setCircleQty(qty);
taskDetail.setCircleStatus(QuantityConstant.CIRCLE_REGISTER_STATUS_COMPLETE);
if (!taskDetailService.updateById(taskDetail)) {
throw new JeecgBootException("更新任务详情失败");
}
- Result<Integer> result = new Result<Integer>();
- result.setCode(200);
- result.setMessage("调整成功");
- result.setResult(cycleCountHeader.getId());
- return result;
+ // Result<Integer> result = new Result<Integer>();
+ // result.setCode(200);
+ // result.setMessage("调整成功");
+ // result.setResult(cycleCountHeader.getId());
+ return Result.OK("调整成功");
}
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 3cbd656..78eaeb9 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -1193,18 +1193,18 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
if (taskHeader.getStatus() >= QuantityConstant.TASK_STATUS_RELEASE) {
return Result.error("下发wcs任务时, 任务" + taskId + "已经下发，请不要重复下发，操作中止");
}
+ taskHeader.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
+ boolean success = taskHeaderService.updateStatusById(QuantityConstant.TASK_STATUS_RELEASE, taskHeader.getId());
+ if (!success) {
+ throw new JeecgBootException("下发wcs任务时, 更新任务状态失败");
+ }
int toWcs = taskHeader.getToWcs();
if (toWcs == QuantityConstant.TO_WCS) {
Result result = wcsService.wcsTaskAssign(taskHeader);
if (!result.isSuccess()) {
- return Result.error(result.getMessage());
+ throw new JeecgBootException(result.getMessage());
}
}
- taskHeader.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
- boolean success = taskHeaderService.updateStatusById(QuantityConstant.TASK_STATUS_RELEASE, taskHeader.getId());
- if (!success) {
- throw new JeecgBootException("下发wcs任务时, 更新任务状态失败");
- }
return Result.ok("下发wcs任务成功");
}