From b6e7db5a3b8910a5a9c7b1251d542895b634e88f Mon Sep 17 00:00:00 2001 From: userName Date: Thu, 13 Feb 2025 16:13:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=9F=A5=E8=AF=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/service/receiving/ASNManager.java | 4 ++ .../receiving/pojo/DefaultASNManager.java | 51 +++++++++++++++++++ .../web/servlet/SwmsExportGridServlet.java | 2 +- .../origen/inventory/maintainXuliehaoPage.xml | 3 +- .../origen/putaway/mainMoveDocDetailPage.xml | 14 +++-- .../origen/putaway/mainStackingDetailPage.xml | 14 +++-- .../putaway/maintainMoveDocbillSapPage.xml | 14 +++-- .../origen/receiving/editPrintAsnBillPage.xml | 39 ++++++++++++++ .../receiving/maintainASNDetailPage.xml | 8 +-- .../origen/receiving/maintainASNPage.xml | 4 +- .../origen/receiving/maintainLXputPage.xml | 14 +++-- .../receiving/maintainReceivedRecordPage.xml | 14 +++-- .../origen/receiving/maintainzhijianPage.xml | 14 +++-- .../origen/shipping/maintainTaskPage.xml | 2 +- .../WEB-INF/classes/dataSourceContext.xml | 10 ++-- 15 files changed, 176 insertions(+), 31 deletions(-) create mode 100644 src/webapp/WEB-INF/classes/config/origen/receiving/editPrintAsnBillPage.xml diff --git a/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java index 85e8cc9..432515a 100644 --- a/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java +++ b/src/main/java/com/dev/swms/server/service/receiving/ASNManager.java @@ -467,4 +467,8 @@ public interface ASNManager extends BaseManager{ void cancelPuts(List ids); double getwsQtyMap(Map map); + //批量打印整理标签 + @Transactional + void printOrderAll(List ids,Long print); + } \ No newline at end of file diff --git a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java index da22f2a..b6c0cc7 100644 --- a/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java +++ b/src/main/java/com/dev/swms/server/service/receiving/pojo/DefaultASNManager.java @@ -4712,4 +4712,55 @@ public void addASNDetail(Long id,ASNDetail asnDetail) { } return qty; } + + @Override + public void printOrderAll(List ids,Long print){ + SimpleDateFormat sdf=new SimpleDateFormat("yyyyMMdd"); + + double allocatedQuantity = 0; + for (Long id: ids) { + ASN asn=commonDao.load(ASN.class, id); + List ads=commonDao.findByQuery(" from ASNDetail ad where ad.asn.id=" + +id+" and ad.expectedQuantity>0"); + for(ASNDetail ad:ads) { + Long quantity =1L; + Item item=commonDao.load(Item.class, ad.getItem().getId()); + PrintEquipment pe=commonDao.load(PrintEquipment.class, print); + String qrcode="QAR/"+asn.getRelatedBill1()+"/"+ad.getStrBill8()+"/"+item.getCode()+"/"+item.getUnit(); + if(ad.getStrBill2()!=null&&!ad.getStrBill2().equals("")) { + qrcode+="/"+ad.getStrBill2()+"/"+sdf.format(new Date()); + }else { + qrcode+="//"+sdf.format(new Date()); + } + JSONObject obj=new JSONObject(); + obj.put("itemName", item.getName()); + obj.put("unit", item.getUnit()); + obj.put("quantity", ad.getExpectedQtyOfMasterUnit()); + obj.put("taskCode", asn.getRelatedBill1()); + obj.put("qrcode", qrcode); + obj.put("barCode", ad.getStrBill2()==null?"":ad.getStrBill2()); + obj.put("loc", ad.getLotInfo().getPropC2()); + obj.put("itemCode", item.getCode()); +// obj.put("propC1",sdf.format(new Date())); + obj.put("propC1",ad.getLotInfo().getPropC1()); + obj.put("workName",UserHolder.getUser().getName()); + System.out.println(obj.toString()); + PrintTask pt=new PrintTask(); + pt.setType("3"); + pt.setStatus("0"); + pt.setQuantity(quantity); + pt.setContent(obj.toString()); + pt.setCreateName(UserHolder.getUser().getName()); + pt.setCreateDate(new Date()); + pt.setMac(pe.getMac()); + pt.setPrintName(pe.getPrintName()); + pt.setPrintTitle(asn.getRelatedBill1()+"/"+item.getCode()); + commonDao.store(pt); + } + + } + + } + + } diff --git a/src/main/java/com/dev/swms/server/web/servlet/SwmsExportGridServlet.java b/src/main/java/com/dev/swms/server/web/servlet/SwmsExportGridServlet.java index 848f9cb..61eef4b 100644 --- a/src/main/java/com/dev/swms/server/web/servlet/SwmsExportGridServlet.java +++ b/src/main/java/com/dev/swms/server/web/servlet/SwmsExportGridServlet.java @@ -64,7 +64,7 @@ public class SwmsExportGridServlet extends BaseHttpServlet { // logger.info("parameter:"+ids); // logger.info("parameter2:"); if(ids != null) { - ids = URLDecoder.decode(ids); + ids = URLDecoder.decode(ids,"utf-8"); } } diff --git a/src/webapp/WEB-INF/classes/config/origen/inventory/maintainXuliehaoPage.xml b/src/webapp/WEB-INF/classes/config/origen/inventory/maintainXuliehaoPage.xml index fe17a5f..d72d8eb 100644 --- a/src/webapp/WEB-INF/classes/config/origen/inventory/maintainXuliehaoPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/inventory/maintainXuliehaoPage.xml @@ -53,7 +53,8 @@ forceOverride="false" manualEditable="true"> + from PlantLocation pl where 1=1 and pl.disabled=false + order by pl.code]]> diff --git a/src/webapp/WEB-INF/classes/config/origen/putaway/mainMoveDocDetailPage.xml b/src/webapp/WEB-INF/classes/config/origen/putaway/mainMoveDocDetailPage.xml index e7b5a68..21be39d 100644 --- a/src/webapp/WEB-INF/classes/config/origen/putaway/mainMoveDocDetailPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/putaway/mainMoveDocDetailPage.xml @@ -32,9 +32,17 @@ - + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/putaway/mainStackingDetailPage.xml b/src/webapp/WEB-INF/classes/config/origen/putaway/mainStackingDetailPage.xml index 043b3ec..ba1fe6b 100644 --- a/src/webapp/WEB-INF/classes/config/origen/putaway/mainStackingDetailPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/putaway/mainStackingDetailPage.xml @@ -20,9 +20,17 @@ - + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/putaway/maintainMoveDocbillSapPage.xml b/src/webapp/WEB-INF/classes/config/origen/putaway/maintainMoveDocbillSapPage.xml index 804e4f0..375bc09 100644 --- a/src/webapp/WEB-INF/classes/config/origen/putaway/maintainMoveDocbillSapPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/putaway/maintainMoveDocbillSapPage.xml @@ -35,9 +35,17 @@ - + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/editPrintAsnBillPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/editPrintAsnBillPage.xml new file mode 100644 index 0000000..d6c0b84 --- /dev/null +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/editPrintAsnBillPage.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml index 126b943..74ad994 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNDetailPage.xml @@ -25,10 +25,10 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml index e1612b7..9ae9726 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml @@ -173,7 +173,9 @@ - + + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainLXputPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainLXputPage.xml index cc68abf..d3c8213 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainLXputPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainLXputPage.xml @@ -19,9 +19,17 @@ - + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainReceivedRecordPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainReceivedRecordPage.xml index 3cdd709..34d0e48 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainReceivedRecordPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainReceivedRecordPage.xml @@ -35,9 +35,17 @@ - + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainzhijianPage.xml b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainzhijianPage.xml index 63b1609..45cc855 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainzhijianPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainzhijianPage.xml @@ -33,9 +33,17 @@ showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="beginDate" toDate="endDate"/> --> - + + + + + + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml index 3a480aa..3ff2cd9 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainTaskPage.xml @@ -46,7 +46,7 @@ FROM LocationStorage ls WHERE 1=1 and ls.name in ('201','202','203','204','205','206','207','208','209','210','211','212', - '213','214','215','101','102','103','104','105','106','107') + '213','214','215','101','102','103','104','105','106','107','602','603','604','605') ]]> - jdbc:sqlserver://47.103.100.52:1433;DatabaseName=zwlgtest + jdbc:sqlserver://192.168.2.88:1433;DatabaseName=zwlgtest - WMSDB - + + sa - - WmsYc@5688 + Amecadmin1! + 500