no message
							parent
							
								
									452ce9bf4f
								
							
						
					
					
						commit
						4c5fbb8b33
					
				| 
						 | 
					@ -117,7 +117,7 @@ public class BydAppServiceImpl implements BydAppService {
 | 
				
			||||||
        //创建ASN明细和ItemKey和Task任务库存
 | 
					        //创建ASN明细和ItemKey和Task任务库存
 | 
				
			||||||
        for (BarCodeVo barCodeVo : barCodeVos) {
 | 
					        for (BarCodeVo barCodeVo : barCodeVos) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            AsnDetail asnDetail = asnDetailService.createAsnDetail(item, stock, null, barCodeVo.getPropC1(), barCodeVo.getBoxNumber(), barCodeVo.getPropC3(), Timestamp.valueOf(DateUtil.formatDateTime(DateUtil.parse(barCodeVo.getPropD1()))), barCodeVo.getOrderQty(), barCodeVo.getMo());
 | 
					            AsnDetail asnDetail = asnDetailService.createAsnDetail(item, stock, null, barCodeVo.getPropC1(), barCodeVo.getBoxNumber(), barCodeVo.getPropC3(), barCodeVo.getPropD1() == null ? null : Timestamp.valueOf(DateUtil.formatDateTime(DateUtil.parse(barCodeVo.getPropD1()))), barCodeVo.getOrderQty(), barCodeVo.getMo());
 | 
				
			||||||
            if (asnDetail != null) {
 | 
					            if (asnDetail != null) {
 | 
				
			||||||
                asnDetail.setReceivedQty(asnDetail.getOrderQty());
 | 
					                asnDetail.setReceivedQty(asnDetail.getOrderQty());
 | 
				
			||||||
                asnDetail.setStatus(BizStatus.RECEIVED);
 | 
					                asnDetail.setStatus(BizStatus.RECEIVED);
 | 
				
			||||||
| 
						 | 
					@ -496,7 +496,7 @@ public class BydAppServiceImpl implements BydAppService {
 | 
				
			||||||
                // 没有空车的处理逻辑
 | 
					                // 没有空车的处理逻辑
 | 
				
			||||||
                if (agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.FB_RETURN, "FORKLIFT_MOVE")) {
 | 
					                if (agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.FB_RETURN, "FORKLIFT_MOVE")) {
 | 
				
			||||||
                    // 生成agv任务进行等待
 | 
					                    // 生成agv任务进行等待
 | 
				
			||||||
                    AgvTask agvTask = agvTaskService.createAgvTask(BizStatus.FB_RETURN, task.getSrcStock(),task.getSrcStock().getPoint().getCode() , endPoint.getCode(), "FORKLIFT_MOVE");
 | 
					                    AgvTask agvTask = agvTaskService.createAgvTask(BizStatus.FB_RETURN, task.getSrcStock(), task.getSrcStock().getPoint().getCode(), endPoint.getCode(), "FORKLIFT_MOVE");
 | 
				
			||||||
                    pointService.usedPoint(endPoint);
 | 
					                    pointService.usedPoint(endPoint);
 | 
				
			||||||
                    kmReService.sendAgvTask(agvTask, kmReService.sendAgvTaskCcJson(agvTask));
 | 
					                    kmReService.sendAgvTask(agvTask, kmReService.sendAgvTaskCcJson(agvTask));
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue