wms / wms4_hh · Commits

Commit 3f65f20994b9a09000e2a8d55d89ff3f16714d80

Authored by 谭毅彬
2 parents 2cb735ef 3f16f976

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4.git into develop

Inline Side-by-side
Showing 11 changed files with 34 additions and 30 deletions
ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
  View file @3f65f20
... ... @@ -135,6 +135,12 @@ export default {
135 135 dataIndex: 'containerCode'
136 136 },
137 137 {
  138 + title: '容器状态',
  139 + align: "center",
  140 + dataIndex: 'containerStatus_dictText',
  141 + scopedSlots: {customRender: 'containerStatus_dictText'}
  142 + },
  143 + {
138 144 title: '库位编码',
139 145 align: 'center',
140 146 dataIndex: 'locationCode'
... ...
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
  View file @3f65f20
... ... @@ -10,7 +10,7 @@
10 10 <j-multi-select-tag
11 11 v-model="queryParam.zoneCode"
12 12 :options="zoneOptions"
13   - placeholder="请选择">
  13 + placeholder="请选择库区">
14 14 </j-multi-select-tag>
15 15 </a-form-model-item>
16 16 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @3f65f20
... ... @@ -10,7 +10,7 @@
10 10 <j-multi-select-tag
11 11 v-model="queryParam.zoneCode"
12 12 :options="zoneOptions"
13   - placeholder="请选择">
  13 + placeholder="请选择库区">
14 14 </j-multi-select-tag>
15 15 </a-form-model-item>
16 16 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
  View file @3f65f20
... ... @@ -10,7 +10,7 @@
10 10 <j-multi-select-tag
11 11 v-model="queryParam.zoneCode"
12 12 :options="zoneOptions"
13   - placeholder="请选择">
  13 + placeholder="请选择库区">
14 14 </j-multi-select-tag>
15 15 </a-form-model-item>
16 16 </a-form-item>
... ...
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
  View file @3f65f20
... ... @@ -10,7 +10,7 @@
10 10 <j-multi-select-tag
11 11 v-model="queryParam.zoneCode"
12 12 :options="zoneOptions"
13   - placeholder="请选择">
  13 + placeholder="请选择库区">
14 14 </j-multi-select-tag>
15 15 </a-form-model-item>
16 16 </a-form-item>
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/service/WcsServiceImpl.java
  View file @3f65f20
... ... @@ -139,6 +139,10 @@ public class WcsServiceImpl implements WcsService {
139 139 return Result.error("分配库位时，任务已经完成不能再分库位");
140 140 }
141 141 int taskType = taskHeader.getTaskType();
  142 + if (taskType == QuantityConstant.TASK_TYPE_WHOLESHIPMENT || taskType == QuantityConstant.TASK_TYPE_EMPTYSHIPMENT
  143 + || taskType == QuantityConstant.TASK_TYPE_MANY_EMPTYSHIPMENT) {
  144 + return Result.error("分配库位时，整出类型的任务不需要分配库位");
  145 + }
142 146 String containerCode = taskHeader.getContainerCode();
143 147 String toLocationCode = taskHeader.getToLocationCode();
144 148 if (StringUtils.isNotEmpty(toLocationCode)) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryHeaderServiceImpl.java
  View file @3f65f20
... ... @@ -93,7 +93,7 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
93 93 }
94 94 return success;
95 95 }
96   - return false;
  96 + return true;
97 97 }
98 98  
99 99 @Override
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/service/impl/ReceiptContainerHeaderServiceImpl.java
  View file @3f65f20
... ... @@ -33,6 +33,7 @@ import org.jeecg.utils.StringUtils;
33 33 import org.jeecg.utils.constant.QuantityConstant;
34 34 import org.springframework.beans.factory.annotation.Autowired;
35 35 import org.springframework.stereotype.Service;
  36 +import org.springframework.transaction.annotation.Propagation;
36 37 import org.springframework.transaction.annotation.Transactional;
37 38  
38 39 import com.alibaba.fastjson.JSON;
... ... @@ -105,7 +106,7 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
105 106 }
106 107  
107 108 @Override
108   - @Transactional(rollbackFor = JeecgBootException.class)
  109 + @Transactional(rollbackFor = JeecgBootException.class, propagation = Propagation.REQUIRES_NEW)
109 110 @OperationLog(bizId = "''", bizType = "'入库单追踪'", tag = "'入库任务生成'", extra = "#extraJsonString1", msg = "'任务ID：' + #taskHeader.getId()",
110 111 condition = "#receiptContainerDetailList.size() > 0", recordReturnValue = true)
111 112 @OperationLog(bizId = "''", bizType = "'任务追踪'", tag = "'入库任务生成'", extra = "#extraJsonString2",
... ... @@ -199,15 +200,15 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
199 200 if (!success) {
200 201 throw new JeecgBootException("创建入库任务， 任务详情生成失败");
201 202 }
202   - if (receiptContainerHeader.getTaskType() == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
203   - // 如果是空托盘，那么不需要更新库存
204   - if (!containerFillStatus.equals(QuantityConstant.STATUS_CONTAINER_FILL_EMPTY)) {
205   - success = inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode);
206   - if (!success) {
207   - throw new JeecgBootException("创建入库任务, 更新库存头失败");
208   - }
209   - }
210   - }
  203 +// if (receiptContainerHeader.getTaskType() == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT) {
  204 +// // 如果是空托盘，那么不需要更新库存
  205 +// if (!containerFillStatus.equals(QuantityConstant.STATUS_CONTAINER_FILL_EMPTY)) {
  206 +// success = inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode);
  207 +// if (!success) {
  208 +// throw new JeecgBootException("创建入库任务, 更新库存头失败");
  209 +// }
  210 +// }
  211 +// }
211 212 success = receiptContainerHeaderService.updateToPortAndStatus(receiptContainerHeader.getToPort(), QuantityConstant.RECEIPT_CONTAINER_TASK,
212 213 receiptContainerHeader.getId());
213 214 if (!success) {
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
  View file @3f65f20
... ... @@ -580,10 +580,6 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
580 580 if (!success) {
581 581 throw new JeecgBootException("生成出库任务时, 更新出库组盘头失败");
582 582 }
583   - success = inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode);
584   - if (!success) {
585   - throw new JeecgBootException("生成出库任务时, 更新库存头失败");
586   - }
587 583 LogRecordContext.putVariable("taskHeader", taskHeader);// 操作日志收集
588 584 LogRecordContext.putVariable("shipmentContainerDetailList", shipmentContainerDetailList);// 操作日志收集
589 585 LogRecordContext.putVariable("extraJsonString1", JSON.toJSONString(shipmentContainerDetailList));// 操作日志收集
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
  View file @3f65f20
... ... @@ -1170,9 +1170,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1170 1170 throw new JeecgBootException("完成入库任务时，更新入库单头失败");
1171 1171 }
1172 1172 }
1173   - if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode)) {
1174   - throw new JeecgBootException("完成入库任务时,更新托盘状态失败");
1175   - }
1176 1173 Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode,
1177 1174 toLocationCode, warehouseCode);
1178 1175 if (!result.isSuccess()) {
... ... @@ -1383,11 +1380,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1383 1380 throw new JeecgBootException("完成出库任务，更新出库单头失败");
1384 1381 }
1385 1382 }
1386   - if (taskType != QuantityConstant.TASK_TYPE_WHOLESHIPMENT) {
1387   - if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode)) {
1388   - throw new JeecgBootException("完成出库任务,更新库存状态失败");
1389   - }
1390   - }
1391 1383 Result result = taskHeaderService.completeTaskUnLockContainerAndLocation(taskHeader.getContainerFillStatus(), taskType, containerCode, fromLocationCode,
1392 1384 toLocationCode, warehouseCode);
1393 1385 if (!result.isSuccess()) {
... ... @@ -1498,6 +1490,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1498 1490 default:
1499 1491 throw new JeecgBootException("创建任务时，没有匹配到这种任务类型" + taskType);
1500 1492 }
  1493 + if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode)) {
  1494 + throw new JeecgBootException("任务类型" + taskType + "创建任务时，更新库存状态失败");
  1495 + }
1501 1496 return result;
1502 1497 }
1503 1498  
... ... @@ -1772,6 +1767,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1772 1767 throw new JeecgBootException("任务类型" + taskType + "完成任务时，更新库位失败");
1773 1768 }
1774 1769 }
  1770 + if (!inventoryHeaderService.updateInventoryContainerStatusByContainerCode(containerCode, warehouseCode)) {
  1771 + throw new JeecgBootException("任务类型" + taskType + "完成任务时，更新托盘状态失败");
  1772 + }
1775 1773 return Result.OK("任务类型" + taskType + "完成任务成功");
1776 1774 }
1777 1775  
... ... @@ -2222,7 +2220,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
2222 2220 if (!result.isSuccess()) {
2223 2221 throw new JeecgBootException(result.getMessage());
2224 2222 }
2225   - taskHeader.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
2226 2223 success = taskHeaderService.updateStatusById(QuantityConstant.TASK_STATUS_COMPLETED, taskHeader.getId());
2227 2224 if (!success) {
2228 2225 throw new JeecgBootException("完成移库任务时, 更新任务失败");
... ...
huaheng-wms-core/src/main/resources/application.yml
  View file @3f65f20
... ... @@ -2,8 +2,8 @@ spring:
2 2 application:
3 3 name: huaheng-wms-core
4 4 profiles:
5   - active: dev
6   -
  5 + active: test
  6 +
7 7  
8 8 huaheng:
9 9 system:
... ...