From b6700586fd81f6ffc6782c69e3f03d8eb4345ca7 Mon Sep 17 00:00:00 2001 From: userName Date: Fri, 7 Mar 2025 18:14:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BA=A4=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E5=8D=95=E6=8D=AE=EF=BC=8C=E6=8B=A3=E8=B4=A7=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E8=87=AA=E5=8A=A8=E9=87=8A=E6=94=BE=E6=A7=BD=E4=BD=8D?= =?UTF-8?q?=E6=A0=BC=EF=BC=8C=E6=8B=A3=E8=B4=A7=E4=BB=BB=E5=8A=A1=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E6=98=BE=E7=A4=BA=E4=BA=A4=E5=8D=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/DefaultInterfaceReqManager.java | 12 ++---------- .../shipping/pojo/DefaultPickTicketManager.java | 17 ++++++++++++----- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java index 66c4c97..b785a03 100644 --- a/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java +++ b/src/main/java/com/dev/swms/server/service/interfaceLog/pojo/DefaultInterfaceReqManager.java @@ -1443,26 +1443,18 @@ public class DefaultInterfaceReqManager extends DefaultBaseManager implements In public void saptoWmsTaskStatus(List 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); } diff --git a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java index 285156d..a967e4f 100644 --- a/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java +++ b/src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java @@ -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 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); + } + + } } }