不需要交单的单据,拣货完成自动释放槽位格,拣货任务直接显示交单完成
							parent
							
								
									b7f398fa97
								
							
						
					
					
						commit
						b6700586fd
					
				| 
						 | 
				
			
			@ -1443,26 +1443,18 @@ public class DefaultInterfaceReqManager extends DefaultBaseManager implements In
 | 
			
		|||
	public void saptoWmsTaskStatus(List<Long> ids,int  status,boolean SAPstatus) {
 | 
			
		||||
		if(SAPstatus) {
 | 
			
		||||
			PickTicket pt =null;
 | 
			
		||||
			SeedWall seedWall=null;
 | 
			
		||||
//			
 | 
			
		||||
			for(Long tid:ids) {
 | 
			
		||||
				Task t=	commonDao.load(Task.class, tid);
 | 
			
		||||
				if(pt==null) {
 | 
			
		||||
					PickTicketDetail ptd=commonDao.load(PickTicketDetail.class, t.getPickTicketDetail().getId());
 | 
			
		||||
					pt=commonDao.load(PickTicket.class, ptd.getPickTicket().getId());
 | 
			
		||||
				}
 | 
			
		||||
				if(seedWall==null&&t.getSeedWall()!=null&&pt.getBillType().getId()==1094) {
 | 
			
		||||
					seedWall=commonDao.load(SeedWall.class, t.getSeedWall().getId());
 | 
			
		||||
				}
 | 
			
		||||
				 t.setStatusCode(status);
 | 
			
		||||
				commonDao.store(t);
 | 
			
		||||
			}
 | 
			
		||||
			if(pt!=null) {
 | 
			
		||||
				if(seedWall!=null) {
 | 
			
		||||
					seedWall.setStatus(WarehouseAreaStatus.FREE);
 | 
			
		||||
					seedWall.setTaskCode(null);
 | 
			
		||||
					seedWall.setStock(null);
 | 
			
		||||
					commonDao.store(seedWall);
 | 
			
		||||
				}
 | 
			
		||||
 | 
			
		||||
			pt.setPrintCount(status);
 | 
			
		||||
			commonDao.store(pt);
 | 
			
		||||
			}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4433,6 +4433,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 | 
			
		|||
		
 | 
			
		||||
		 if (pt.getCode().indexOf("CP") == -1&&((pt.getSourceId()!=null&&pt.getSourceId().indexOf("OT")== -1)
 | 
			
		||||
					|| pt.getSourceId()==null )) {
 | 
			
		||||
			
 | 
			
		||||
				//拣货完成数
 | 
			
		||||
				List<Long> tasks1 = commonDao.findByQuery( 
 | 
			
		||||
						"select p.id from Task p where p.movedQuantityMU>0 and p.movedQuantityMU>=p.planQuantity and p.popular<=0 "
 | 
			
		||||
| 
						 | 
				
			
			@ -4455,14 +4456,10 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 | 
			
		|||
					} else if(bt.getCode().equals("OAPUTPTC")){
 | 
			
		||||
						//OA扣账回传
 | 
			
		||||
					boolean dl=	interfaceReqManager.wmsOaFaliaohuichuang(tasks1);
 | 
			
		||||
							
 | 
			
		||||
//							submitWMSTask(pt, tasks1, dl);
 | 
			
		||||
					}else {
 | 
			
		||||
						boolean dl=	interfaceReqManager.wmsSapFaliaohuichuang(tasks1);
 | 
			
		||||
						try {
 | 
			
		||||
							
 | 
			
		||||
						submitWMSTask(pt, tasks1, dl);
 | 
			
		||||
						
 | 
			
		||||
						}catch (Exception e) {
 | 
			
		||||
							if(!dl) {
 | 
			
		||||
								pt.setPriority(-1);//是否扣料失败
 | 
			
		||||
| 
						 | 
				
			
			@ -4471,10 +4468,20 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
 | 
			
		|||
						}
 | 
			
		||||
						if(bt.getCode().equals("GPUTPTC")&&dl) {
 | 
			
		||||
							boolean saptau=	interfaceReqManager.wmsSapTaskStatus(tasks1, "", 2);
 | 
			
		||||
							
 | 
			
		||||
						interfaceReqManager.saptoWmsTaskStatus(tasks1, 2, saptau);
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
					//单据类型是否交单=否,拣货完成直接释放槽位格
 | 
			
		||||
					if(!bt.isBePresentation()) {
 | 
			
		||||
						 if(task.getSeedWall()!=null) {
 | 
			
		||||
							 SeedWall seedWall=commonDao.load(SeedWall.class, task.getSeedWall().getId());
 | 
			
		||||
							 seedWall.setStatus(WarehouseAreaStatus.FREE);
 | 
			
		||||
								seedWall.setTaskCode(null);
 | 
			
		||||
								seedWall.setStock(null);
 | 
			
		||||
								commonDao.store(seedWall);
 | 
			
		||||
						 }
 | 
			
		||||
							
 | 
			
		||||
					}
 | 
			
		||||
				}
 | 
			
		||||
				
 | 
			
		||||
			}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue