wms / wms_guangzhouwanbao · Commits

Commit 6965d960ee1004c167a71af8b40652fd245b1889

Authored by 游杰
1 parent b3268d37

去掉多余代码

Inline Side-by-side
Showing 1 changed file with 10 additions and 56 deletions
src/main/java/com/huaheng/api/wcs/service/taskAssignService/TaskAssignServiceImpl.java
  View file @6965d96
... ... @@ -80,7 +80,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
80 80 @Transactional
81 81 public AjaxResult wcsTaskAssign(TaskHeader taskHeader) {
82 82 //1、判断taskHeader是否为空
83   - Integer preTaskNo = 0;
  83 + int preTaskNo = 0;
84 84 if(taskHeader == null){
85 85 return AjaxResult.error("wms任务为空");
86 86 }
... ... @@ -128,7 +128,7 @@ public class TaskAssignServiceImpl implements TaskAssignService {
128 128 wcsTask.setToPort(taskHeader.getPort());
129 129 wcsTask.setContainerCode(taskHeader.getContainerCode());
130 130 Location location;
131   - boolean direction = true; // true 执行时是入库动作， false 执行时是入库动作
  131 + boolean direction = true; // true 执行时是入库动作， false 执行时是出库动作
132 132 switch(wcsTask.getTaskType().intValue()) {
133 133 case QuantityConstant.TASK_TYPE_WHOLESHIPMENT:
134 134 case QuantityConstant.TASK_TYPE_EMPTYSHIPMENT:
... ... @@ -136,10 +136,10 @@ public class TaskAssignServiceImpl implements TaskAssignService {
136 136 case QuantityConstant.TASK_TYPE_SORTINGSHIPMENT:
137 137 case QuantityConstant.TASK_TYPE_VIEW:
138 138 case QuantityConstant.TASK_TYPE_CYCLECOUNT:
  139 + case QuantityConstant.TASK_TYPE_TRANSFER:
139 140 location = locationService.getLocationByCode(taskHeader.getFromLocation(), warehouseCode);
140 141 direction = false;
141 142 break;
142   - case QuantityConstant.TASK_TYPE_TRANSFER:
143 143 case QuantityConstant.TASK_TYPE_WHOLERECEIPT:
144 144 case QuantityConstant.TASK_TYPE_EMPTYRECEIPT:
145 145 location = locationService.getLocationByCode(taskHeader.getToLocation(), warehouseCode);
... ... @@ -149,11 +149,9 @@ public class TaskAssignServiceImpl implements TaskAssignService {
149 149 location = locationService.getLocationByCode(taskHeader.getToLocation(), warehouseCode);
150 150 break;
151 151 }
152   - if (taskType == QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT
153   - || taskType == QuantityConstant.TASK_TYPE_WHOLESHIPMENT
154   - || taskType == QuantityConstant.TASK_TYPE_SORTINGSHIPMENT
155   - || taskType == QuantityConstant.TASK_TYPE_EMPTYSHIPMENT
156   - || taskType == QuantityConstant.TASK_TYPE_VIEW ) {
  152 +
  153 + // 出库动作
  154 + if (!direction) {
157 155 int rowFlag = location.getRowFlag().intValue();
158 156 if(rowFlag == QuantityConstant.ROW_OUT) {
159 157 Location insideLocation = locationService.getInsideNear(location);
... ... @@ -187,36 +185,15 @@ public class TaskAssignServiceImpl implements TaskAssignService {
187 185 return AjaxResult.error("执行外侧库位出库时，相应的内侧库位有任务，请先执行完内侧库位任务");
188 186 }
189 187 }
  188 + taskHeader.setPreTaskNo(preTaskNo);
  189 + taskHeaderService.updateById(taskHeader);
190 190 }
191   - taskHeader.setPreTaskNo(preTaskNo);
192   - LambdaQueryWrapper<TaskHeader> lambdaWrapper2 = Wrappers.lambdaQuery();
193   - lambdaWrapper2.eq(TaskHeader::getId, taskHeader.getId());
194   - taskHeaderService.update(taskHeader, lambdaWrapper2);
195 191 }
196 192  
197   - if(location != null && !direction) {
198   - Location insideLocation = locationService.getNear(location);
199   - if (insideLocation != null) {
200   - String nearLocationCode = insideLocation.getCode();
201   - LambdaQueryWrapper<TaskHeader> lambdaWrapper = Wrappers.lambdaQuery();
202   - lambdaWrapper.eq(TaskHeader::getFromLocation, nearLocationCode)
203   - .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_TRANSFER,
204   - QuantityConstant.TASK_TYPE_WHOLESHIPMENT, QuantityConstant.TASK_TYPE_EMPTYSHIPMENT)
205   - .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)
206   - .ge(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_RELEASE);
207   - TaskHeader taskHeader3 = taskHeaderService.getOne(lambdaWrapper);
208   - if (taskHeader3 != null) {
209   - preTaskNo = taskHeader3.getId();
210   - taskHeader.setPreTaskNo(preTaskNo);
211   - LambdaQueryWrapper<TaskHeader> lambdaWrapper2 = Wrappers.lambdaQuery();
212   - lambdaWrapper2.eq(TaskHeader::getId, taskHeader.getId());
213   - taskHeaderService.update(taskHeader, lambdaWrapper2);
214   - }
215   - }
216   - }
217   - if (0 != preTaskNo) {
  193 + if (preTaskNo != 0) {
218 194 wcsTask.setPreTaskNo(String.valueOf(preTaskNo));
219 195 }
  196 +
220 197 if(location != null) {
221 198 wcsTask.setStation(location.getRoadway());
222 199 wcsTask.setRoadWay(location.getRoadway());
... ... @@ -240,29 +217,6 @@ public class TaskAssignServiceImpl implements TaskAssignService {
240 217 wcsTask.setRemark("0");
241 218 wcsTask.setPlatform(platform);
242 219  
243   - //找到任务明细
244   - LambdaQueryWrapper<TaskDetail> taskDetailLam = Wrappers.lambdaQuery();
245   - taskDetailLam.eq(TaskDetail::getTaskId,taskHeader.getId());
246   - List<TaskDetail> taskDetailList = taskDetailService.list(taskDetailLam);
247   - if(taskDetailList == null){
248   - return AjaxResult.error("没有子任务");
249   - }
250   - List<TaskDetails> taskDetails =new ArrayList<>();
251   - for(TaskDetail item : taskDetailList) {
252   - TaskDetails details = new TaskDetails();
253   - details.setMaterialCode(item.getMaterialCode());
254   - details.setMaterialName(item.getMaterialName());
255   - if(StringUtils.isEmpty(item.getMaterialUnit())) {
256   - details.setUnit("PCS");
257   - } else {
258   - details.setUnit(item.getMaterialUnit());
259   - }
260   - details.setQty(item.getQty());
261   - details.setReferLineNo(item.getId().toString());
262   - taskDetails.add(details);
263   - }
264   -
265   - wcsTask.setTaskDetails(taskDetails);
266 220 Container container = containerService.getContainerByCode(containerCode, warehouseCode);
267 221 String area = container.getArea();
268 222 //4、发送数据
... ...