Commit 0e594c95cb039328883d412df51bb3c365561c94
Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop
Showing
5 changed files
with
19 additions
and
28 deletions
ant-design-vue-jeecg/src/views/system/monitor/locationStatus.vue
... | ... | @@ -59,7 +59,7 @@ |
59 | 59 | <ul id="info_list"> |
60 | 60 | <li><span>库位:</span><input type="text" id="code" disabled/></li> |
61 | 61 | <li><span>容器编码:</span><input type="text" id="containerCode" disabled/></li> |
62 | - <li><span>物料信息:<select id="material" style="width: auto"><option>无</option></select></span></li> | |
62 | + <li><span>物料信息:<select id="material" style="width: auto; min-width: 200px;padding: 0px 8px;appearance: none;pointer-events: none;"><option>无</option></select></span></li> | |
63 | 63 | </ul> |
64 | 64 | </div> |
65 | 65 | </form> |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/service/impl/HuahengMultiHandlerServiceImpl.java
... | ... | @@ -37,23 +37,29 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
37 | 37 | |
38 | 38 | @Resource |
39 | 39 | private ITaskHeaderService taskHeaderService; |
40 | + | |
40 | 41 | @Resource |
41 | 42 | private IReceiptContainerHeaderService receiptContainerHeaderService; |
43 | + | |
42 | 44 | @Resource |
43 | 45 | private IShipmentCombinationService shipmentCombinationService; |
46 | + | |
44 | 47 | @Resource |
45 | 48 | private IShipmentDetailService shipmentDetailService; |
49 | + | |
46 | 50 | @Resource |
47 | 51 | private IInventoryDetailService inventoryDetailService; |
52 | + | |
48 | 53 | @Resource |
49 | 54 | private IShipmentContainerHeaderService shipmentContainerHeaderService; |
55 | + | |
50 | 56 | @Resource |
51 | 57 | private IMobileService mobileService; |
58 | + | |
52 | 59 | @Resource |
53 | 60 | private IErpService erpService; |
54 | 61 | |
55 | 62 | @Override |
56 | - @Transactional(rollbackFor = Exception.class) | |
57 | 63 | public Result sendTaskToWcs(TaskHeader taskHeader) { |
58 | 64 | if (taskHeader == null) { |
59 | 65 | return Result.error("任务信息为空"); |
... | ... | @@ -70,7 +76,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
70 | 76 | } |
71 | 77 | |
72 | 78 | @Override |
73 | - @Transactional(rollbackFor = Exception.class) | |
74 | 79 | public Result createReceiptTask(ReceiptContainerHeader receiptContainerHeader, String warehouseCode) { |
75 | 80 | Result result = handleMultiProcess("createReceiptTask", warehouseCode, new MultiProcessListener() { |
76 | 81 | @Override |
... | ... | @@ -82,7 +87,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
82 | 87 | } |
83 | 88 | |
84 | 89 | @Override |
85 | - @Transactional(rollbackFor = Exception.class) | |
86 | 90 | public Result combination(CombinationModel combinationModel) { |
87 | 91 | Result result = handleMultiProcess("combination", new MultiProcessListener() { |
88 | 92 | @Override |
... | ... | @@ -94,7 +98,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
94 | 98 | } |
95 | 99 | |
96 | 100 | @Override |
97 | - @Transactional(rollbackFor = Exception.class) | |
98 | 101 | public Result combination(CombinationParam combinationParam) { |
99 | 102 | Result result = handleMultiProcess("combination", new MultiProcessListener() { |
100 | 103 | @Override |
... | ... | @@ -113,7 +116,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
113 | 116 | } |
114 | 117 | |
115 | 118 | @Override |
116 | - @Transactional(rollbackFor = Exception.class) | |
117 | 119 | public Result cancelCombine(Integer id) { |
118 | 120 | Result result = handleMultiProcess("cancelCombine", new MultiProcessListener() { |
119 | 121 | @Override |
... | ... | @@ -126,7 +128,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
126 | 128 | } |
127 | 129 | |
128 | 130 | @Override |
129 | - @Transactional(rollbackFor = Exception.class) | |
130 | 131 | public Result autoCombination(String shipmentCode, String warehouseCode) { |
131 | 132 | Result result = handleMultiProcess("combination", new MultiProcessListener() { |
132 | 133 | @Override |
... | ... | @@ -139,7 +140,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
139 | 140 | } |
140 | 141 | |
141 | 142 | @Override |
142 | - @Transactional(rollbackFor = Exception.class) | |
143 | 143 | public Result createShipmentTask(ShipmentContainerHeader shipmentContainerHeader, String warehouseCode, long shipmentOrder, int sequence, int sequenceNumber) { |
144 | 144 | Result result = handleMultiProcess("createShipmentTask", new MultiProcessListener() { |
145 | 145 | @Override |
... | ... | @@ -152,7 +152,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
152 | 152 | } |
153 | 153 | |
154 | 154 | @Override |
155 | - @Transactional(rollbackFor = Exception.class) | |
156 | 155 | public Result callBox(CallBoxBean bean, String warehouseCode) { |
157 | 156 | String lockKey = warehouseCode; |
158 | 157 | Result result = handleMultiProcess("callBox", lockKey, new MultiProcessListener() { |
... | ... | @@ -166,7 +165,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
166 | 165 | } |
167 | 166 | |
168 | 167 | @Override |
169 | - @Transactional(rollbackFor = Exception.class) | |
170 | 168 | public Result quickReceipt(QuickReceiptBean bean, String warehouseCode) { |
171 | 169 | String lockKey = warehouseCode; |
172 | 170 | Result result = handleMultiProcess("quickReceipt", lockKey, new MultiProcessListener() { |
... | ... | @@ -180,7 +178,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
180 | 178 | } |
181 | 179 | |
182 | 180 | @Override |
183 | - @Transactional(rollbackFor = Exception.class) | |
184 | 181 | public Result backReceipt(ReceiptHeader receiptHeader) { |
185 | 182 | Result result = handleMultiProcess("backReceipt", new MultiProcessListener() { |
186 | 183 | @Override |
... | ... | @@ -193,7 +190,6 @@ public class HuahengMultiHandlerServiceImpl extends HuahengBaseController implem |
193 | 190 | } |
194 | 191 | |
195 | 192 | @Override |
196 | - @Transactional(rollbackFor = Exception.class) | |
197 | 193 | public Result backShipment(ShipmentHeader shipmentHeader) { |
198 | 194 | Result result = handleMultiProcess("backShipment", new MultiProcessListener() { |
199 | 195 | @Override |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
... | ... | @@ -141,7 +141,12 @@ public class ShipmentContainerHeaderController extends JeecgController<ShipmentC |
141 | 141 | public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { |
142 | 142 | List<String> idList = Arrays.asList(ids.split(",")); |
143 | 143 | List<Integer> idInterList = idList.stream().map(Integer::parseInt).collect(Collectors.toList()); |
144 | - return shipmentContainerHeaderService.cancelCombine(idInterList); | |
144 | + Result result = null; | |
145 | + for (Integer id : idInterList) { | |
146 | + result = huahengMultiHandlerService.cancelCombine(id); | |
147 | + } | |
148 | + return result; | |
149 | +// return shipmentContainerHeaderService.cancelCombine(idInterList); | |
145 | 150 | } |
146 | 151 | |
147 | 152 | /** |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/IShipmentContainerHeaderService.java
... | ... | @@ -50,11 +50,11 @@ public interface IShipmentContainerHeaderService extends IService<ShipmentContai |
50 | 50 | */ |
51 | 51 | Result cancelCombine(Integer id); |
52 | 52 | |
53 | - /** | |
54 | - * 取消配盘 | |
55 | - * @return | |
56 | - */ | |
57 | - Result cancelCombine(List<Integer> ids); | |
53 | +// /** | |
54 | +// * 取消配盘 | |
55 | +// * @return | |
56 | +// */ | |
57 | +// Result cancelCombine(List<Integer> ids); | |
58 | 58 | |
59 | 59 | /** |
60 | 60 | * 更新任务类型 |
... | ... |
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/service/impl/ShipmentContainerHeaderServiceImpl.java
... | ... | @@ -238,16 +238,6 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont |
238 | 238 | } |
239 | 239 | |
240 | 240 | @Override |
241 | - @Transactional(rollbackFor = Exception.class) | |
242 | - public Result cancelCombine(List<Integer> ids) { | |
243 | - Result result = null; | |
244 | - for (Integer id : ids) { | |
245 | - result = huahengMultiHandlerService.cancelCombine(id); | |
246 | - } | |
247 | - return result; | |
248 | - } | |
249 | - | |
250 | - @Override | |
251 | 241 | public boolean updateTaskTypeById(int taskType, int id) { |
252 | 242 | ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader(); |
253 | 243 | shipmentContainerHeader.setTaskType(taskType); |
... | ... |