From 35fb91981489c61790f36f1b607761518394695e Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Wed, 14 Aug 2024 10:48:44 +0800 Subject: [PATCH] no message --- .gitignore | 1 + .../pojo/DefaultInventoryManager.java | 7 +-- .../pojo/DefaultPickTicketManager.java | 55 +++++++++++-------- .../server/web/servlet/PickingServlet.java | 1 - .../WEB-INF/classes/dataSourceContext.xml | 4 +- 5 files changed, 36 insertions(+), 32 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f97022 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target/ \ No newline at end of file diff --git a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java index 96fb660..740a14c 100644 --- a/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java +++ b/src/main/java/com/dev/swms/server/service/inventory/pojo/DefaultInventoryManager.java @@ -233,7 +233,6 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven inventory.setQuantity(inventory.getQuantity()+quantity); inventory.setQtyOfMasterPack(inventory.getQuantity()); inventory.setQueuedQuantity(inventory.getQueuedQuantity()+quantity); - System.out.println(inventory.getQuantity()); if (inventory.isNew()) { iki.getInventories().add(inventory); } else { @@ -242,11 +241,7 @@ public class DefaultInventoryManager extends DefaultBaseManager implements Inven } } storeItemKeyInventory(iki); - //写库存日志 - InventoryLog log = new InventoryLog(logType, 1, operator, loc, itemKeys, new Date(), quantity, pu, null, null, null); - log.setOperator(operator); - log.setRelatedBill(itemKeys.getLotInfo().getPropLC1()); - this.commonDao.store(log); + if(inventory.getQuantity() <= 0 && inventory.getQtyOfMasterPack() <= 0 && inventory.getQueuedQuantity() <= 0){ commonDao.delete(inventory); } 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 690cf1c..1a286c5 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 @@ -2748,6 +2748,36 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements PickTicket pt=ptd.getPickTicket(); str=t.getItemKey().getItem().getCode();//物料编码 tl_quantity=t.getPlanQuantityMU(); + Worker worker=this.commonDao.get(Worker.class, workerId); + String operator=worker==null?UserHolder.getUser().getLoginName():worker.getName(); + ItemKey ik=t.getItemKey(); + ik.getLotInfo().setPropLC1(ptd.getPickTicket().getRelatedBill3());//配料工单 + commonDao.store(ik); + + /**工单退料回传EMS*/ + String ldbz=getPropertiesParm("ldxt.bz"); + if(ldbz.equals("1")){ + String propC3=""; + if(str.indexOf("DG")!=-1 || str.indexOf("FM")!=-1){ + if(tl_quantity>0){ + propC3="CG01"; + }else{ + propC3="ZZ05"; + } + }else{ + propC3="CG01"; + } + + jdbcManager.return_out_back(t.getPickTicketDetail().getPickTicket().getRelatedBill3(),t.getPickTicketDetail().getItem().getCode(), + t.getPickTicketDetail().getItem().getName(), t.getItemKey().getLotInfo().getPropC9(), + t.getPickTicketDetail().getItem().getWork_name(), propC3, t.getPickTicketDetail().getItem().getCriterion_loc_code(), planQuantity, t.getSrcLoc().getCode(), t.getPickTicketDetail().getItem().getWork_name(),t.getItemKey().getLotInfo()==null?"":t.getItemKey().getLotInfo().getPropC8()); + } + + //写库存日志 + InventoryLog log = new InventoryLog(InventoryLogType.CONVERT_PACKAGEUNIT, 1, operator, t.getSrcLoc(), ik, new Date(), planQuantity, t.getPackageUnit(), null, null, null); + log.setOperator(operator); + log.setRelatedBill(ik.getLotInfo().getPropLC1()); + this.commonDao.store(log); if(t.getOutBoxCount()!=null){ String hql=" from OutBoxCount obc where obc.id="+t.getOutBoxCount().getId()+" "; List obcList= commonDao.findByQuery(hql); @@ -2761,11 +2791,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements } - Worker worker=this.commonDao.get(Worker.class, workerId); - String operator=worker==null?UserHolder.getUser().getLoginName():worker.getName(); - ItemKey ik=t.getItemKey(); - ik.getLotInfo().setPropLC1(ptd.getPickTicket().getRelatedBill3());//配料工单 - commonDao.store(ik); + inventoryManager.receiving(t.getSrcLoc(), ik, planQuantity, t.getPackageUnit(), t.getCreateTime(),InventoryLogType.CONVERT_PACKAGEUNIT, operator); t.setPlanQuantity(t.getPlanQuantity()-planQuantity); t.setDstLoc(null); @@ -2786,24 +2812,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements this.commonDao.delete(t); } - /**工单退料回传EMS*/ - String ldbz=getPropertiesParm("ldxt.bz"); - if(ldbz.equals("1")){ - String propC3=""; - if(str.indexOf("DG")!=-1 || str.indexOf("FM")!=-1){ - if(tl_quantity>0){ - propC3="CG01"; - }else{ - propC3="ZZ05"; - } - }else{ - propC3="CG01"; - } - - jdbcManager.return_out_back(t.getPickTicketDetail().getPickTicket().getRelatedBill3(),t.getPickTicketDetail().getItem().getCode(), - t.getPickTicketDetail().getItem().getName(), t.getItemKey().getLotInfo().getPropC9(), - t.getPickTicketDetail().getItem().getWork_name(), propC3, t.getPickTicketDetail().getItem().getCriterion_loc_code(), planQuantity, t.getSrcLoc().getCode(), t.getPickTicketDetail().getItem().getWork_name(),t.getItemKey().getLotInfo()==null?"":t.getItemKey().getLotInfo().getPropC8()); - } + } @Override diff --git a/src/main/java/com/dev/swms/server/web/servlet/PickingServlet.java b/src/main/java/com/dev/swms/server/web/servlet/PickingServlet.java index 3a4118b..2d4c2d1 100644 --- a/src/main/java/com/dev/swms/server/web/servlet/PickingServlet.java +++ b/src/main/java/com/dev/swms/server/web/servlet/PickingServlet.java @@ -610,7 +610,6 @@ public class PickingServlet extends HttpServlet { String status="0"; String data=""; String msg=""; - PickTicket pt=commonDao.get(PickTicket.class, pick_id); Task t=commonDao.get(Task.class, t_id); if(qty>0&&t!=null){ if(qty<=t.getPlanQuantity()){ diff --git a/src/webapp/WEB-INF/classes/dataSourceContext.xml b/src/webapp/WEB-INF/classes/dataSourceContext.xml index 45e4ab5..85e1279 100644 --- a/src/webapp/WEB-INF/classes/dataSourceContext.xml +++ b/src/webapp/WEB-INF/classes/dataSourceContext.xml @@ -27,10 +27,10 @@ jdbc:oracle:thin:@10.137.146.210:1521:orcl - nzwms + nztest1 - nzwms + nztest1