From 0546bdfb17da0c59218a7386ef94aa0959d93b7e Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925258474@qq.com> Date: Thu, 26 Sep 2024 12:19:23 +0800 Subject: [PATCH] no message --- .../swms/server/model/order/CheckRelea.java | 9 + .../server/model/order/checkRelea.hbm.xml | 1 + .../service/order/CustomsOrderManager.java | 3 + .../pojo/DefaultCustomsOrderManager.java | 14 + .../delivery/editCheckReleaDetailFBPage.xml | 9 +- .../origen/delivery/editReceivePage.xml | 11 +- .../delivery/modifyArrivalReceivePage.xml | 14 +- .../origen/receiving/maintainASNPage.xml | 6 +- .../maintainPickTicketDetailManual2Page.xml | 1 + .../shipping/modifyPickTicketManual2Page.xml | 6 +- .../swms/server/model/order/CheckRelea.class | Bin 8231 -> 0 bytes .../server/model/order/checkRelea.hbm.xml | 74 ---- .../service/order/CustomsOrderManager.class | Bin 11367 -> 0 bytes .../delivery/editCheckReleaDetailFBPage.xml | 79 ---- .../origen/delivery/editReceivePage.xml | 60 ---- .../delivery/modifyArrivalReceivePage.xml | 109 ------ .../origen/receiving/maintainASNPage.xml | 340 ------------------ 17 files changed, 51 insertions(+), 685 deletions(-) delete mode 100644 target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/CheckRelea.class delete mode 100644 target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/checkRelea.hbm.xml delete mode 100644 target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/CustomsOrderManager.class delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/delivery/editReceivePage.xml delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml delete mode 100644 target/jjwms/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml diff --git a/src/main/java/com/dev/swms/server/model/order/CheckRelea.java b/src/main/java/com/dev/swms/server/model/order/CheckRelea.java index aef2e74..d640f5e 100644 --- a/src/main/java/com/dev/swms/server/model/order/CheckRelea.java +++ b/src/main/java/com/dev/swms/server/model/order/CheckRelea.java @@ -1,5 +1,7 @@ package com.dev.swms.server.model.order; +import java.util.Date; + import com.dev.energy.server.model.Entity; import com.dev.swms.server.model.base.Location; import com.dev.swms.server.model.base.UpdateInfo; @@ -57,8 +59,15 @@ public class CheckRelea extends Entity{ private MasterBOL masterBOL; + private Date vehicleDate;//车辆登记时间 + public Date getVehicleDate() { + return vehicleDate; + } + public void setVehicleDate(Date vehicleDate) { + this.vehicleDate = vehicleDate; + } public MasterBOL getMasterBOL() { return masterBOL; } diff --git a/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml b/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml index f45fd95..6fae737 100644 --- a/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml +++ b/src/main/java/com/dev/swms/server/model/order/checkRelea.hbm.xml @@ -70,5 +70,6 @@ + \ No newline at end of file diff --git a/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java b/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java index d6cd4f0..613237d 100644 --- a/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java +++ b/src/main/java/com/dev/swms/server/service/order/CustomsOrderManager.java @@ -44,6 +44,9 @@ public interface CustomsOrderManager extends BaseManager{ @Transactional void saveRegisterCheckRelea(Long asn_id,CheckRelea cr); + //车辆登记 + void saveRegisterCheckRelea2(Long asn_id,CheckRelea cr); + @Transactional void saveFee(Fee fee ,Long asnid,String billObjectType); diff --git a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java index fe0d595..4ba5a68 100644 --- a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java +++ b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java @@ -2786,6 +2786,20 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu } } } + + @Transactional + public void saveRegisterCheckRelea2(Long asn_id,CheckRelea cr) { + ASN asn=commonDao.load(ASN.class, asn_id); + cr.setAsn(asn); + if(asn.getInvoiceBox()!=null) { + cr.setInvoiceBox(asn.getInvoiceBox()); + cr.setOrder(asn.getInvoiceBox().getCustomsOrder()); + } + cr.setVehicleDate(new Date()); + commonDao.store(cr); + wmsOperationHisManager.storeOperationHis(asn.getId(),asn.getCode(), null,"", "发票箱单", "车辆登记",null,null,0, 0,0, 0, asn.getDescription(), "WMS"); + } + public void saveRegisterCheckRelea(Long asn_id,CheckRelea cr) { ASN asn=commonDao.load(ASN.class, asn_id); cr.setAsn(asn); diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml index c4225c5..f5941cc 100644 --- a/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/delivery/editCheckReleaDetailFBPage.xml @@ -23,10 +23,11 @@ - + - + + @@ -67,7 +68,7 @@ - + diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml index 4db7f43..710e90f 100644 --- a/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/delivery/editReceivePage.xml @@ -1,7 +1,7 @@ - + @@ -15,7 +15,7 @@ and c.warehouse = #{SESSION_WAREHOUSE} order by c.code ]]> - + - + - + - - + diff --git a/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml b/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml index 880f314..af5fd59 100644 --- a/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml @@ -38,6 +38,7 @@ checkRelea.worker2.name, checkRelea.worker3.name, checkRelea.license, + checkRelea.vehicleDate, checkRelea.titleNo, checkRelea.telephone, checkRelea.containNo, @@ -71,6 +72,7 @@ + @@ -86,10 +88,12 @@ - - - - + + + + + + @@ -102,7 +106,7 @@ - + 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 63b4ebe..d263f0a 100644 --- a/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml @@ -118,11 +118,11 @@ - - + diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml index b0dd4fe..7111a35 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/maintainPickTicketDetailManual2Page.xml @@ -93,6 +93,7 @@ WHERE 1=1 and inventory.quantity-inventory.queuedQuantity>0 and inventory.warehouse=#{SESSION_WAREHOUSE} + and location.type='STORAGE' and item.id=(select d.item.id from PickTicketDetail d where d.id={id} ) and (inventory.SOI=(select d.pickTicket.relatedBill3 from PickTicketDetail d where d.id={id}) /~ordersAll: or true = {ordersAll}~/ ) /~company.id: AND company.id = {company.id}~/ diff --git a/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml b/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml index c835f54..92cb021 100644 --- a/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml +++ b/src/webapp/WEB-INF/classes/config/origen/shipping/modifyPickTicketManual2Page.xml @@ -15,8 +15,6 @@ (pickTicketDetail.orderQuantity-pickTicketDetail.allocatedQuantity) as unQllocatedQuantity, pickTicketDetail.orderQuantity, pickTicketDetail.allocatedQuantity, - pickTicketDetail.item.company.name, - pickTicketDetail.item.code, pickTicketDetail.item.name, pickTicketDetail.item.specs FROM PickTicketDetail pickTicketDetail @@ -33,9 +31,7 @@ - - - + diff --git a/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/CheckRelea.class b/target/jjwms/WEB-INF/classes/com/dev/swms/server/model/order/CheckRelea.class deleted file mode 100644 index 942cdf3612ae3d14295a0872c2e981da13203d6c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8231 zcma)=dvG0f701t}X+v&)eFMH9#YfY$^wNjV)?$;ir4rK8gci{%H}`InCHLM9dpBtd zNJ82)mC0ssk{VH935wLoY8ScXPnV-M#mW$zvs8FyT6>>^pE81 z{`Q>n`|SCh-}#-r&%Jj12_jlfziy)zi@M5gtyr-qijAGMMzLXg6Sh~ZxfQ!wbiE3$ zdq(W?=oY(bm)fY+qH`jByKZ~KyVDly>b~RewrILGwPl|==o zKH)lLyW8Dm(UK{xH^$nqZ7(xv56~@|*LOu}qExJw>chnW-*f82P?$Mkk2vM3z0G!p zM|_K{UW+<*c%@oAGPCT~{gP9UG&+3OFIA(vIr?sc=QbMA&@4UFZ~M_etG{~;^Pgew za{K{jxQ@#qr(PM7$5$)jtCbeDA_SurEt<+*pIa{R%fg`w1GTw| zw>zB_>k9&_^Uugb8Gg+yVo$=a`?G2WO zstCwDj#YJQ$#eKV9BlPRoW|+wsARWeay4xGF^om$b>>A)z;7puKBTBf=fPJaBKRfd=O_!)dDXmNy5#>L(Pn z^ZIel#SgGo^fK!z8y1iJj1DGCl@In_R7)L|I*w8%ABI z!@|lSj-qqu9dH4V*hN=f_?kVWCtuDE>x$l)c8Cg-0IpyiPtm*5Iw~gULfbr;#=(H~dPv7KYtK zzsrt4ujp*%)kQCU62zVR4c7UhqIs;tkqmkeE`965UWGO8QZ%16xb#KiL4oWJ+ZfjR zilQ?kt!O;hUs#{G!(q*@DLRWad9yS>3vwphTda7$qSvt^FG@HZ?(Co?3tsY@ieArJ zdS^!uESiJ2*qUzca9;MZ--i`-kb(;Q8Y-=wy-{|o=Podq;!#C!h(N+&i)LX0eG~L~ z?D&YHne2EL95+1*mZm3QL$k)JKTz~WcF9YVJPEMF`^4{$6wQi&Qx5}*!K5Q)*H0;$ z9Z@trvS>bt^*~d<$_77CG=~l5gT;Jq(cH)?ZfV)(XNu;s&D_W)ei|_KCfz8jzo6(% z{JI>Orbj_!l19^_bEhtMiMl>Cexc~C^tK?9$s<00a@q-95E5NB7%k!|5xCy2x&o1?>a^+4{Npe;{OaiIEUVcYZWNa z`{@I?v*?4g3jfo_M`-nm-nF6XXJbY|H@R1!9o(BFF|4On7C^R`AlpQcLAVz{wwNH7 z0pw#DAe{3IvX!<8AeWjT+eMJe;9dZ^)C9R4Af*ftE;bDEaWO}>n;>No_#akn7~_yT=5%9U%KMK)6X@kk5!9*P9@Bh#)u0AlI89cLC(? z3=r;88052b6aJfL&CMprei7sr1UxWKEzQj)$UOi#kO9K&9E02@Mr5xEa<2&T1vw&n zO_2Km@<0X%_j?R-y9lz+1UV>z+#!SPGeI5%$hR{AYT_j?lVCi7eOA7LGCj_o&w0z86f;o!XV!eK@OTACqAivB2;qOBR`JNb&$IOVlDuNu9Bl4ID@*9BsHUoq|gc;=f zVnmLa5&4}6@HuM-k+4IU*-akUs(B&lw>6lK_J} zA%Z+n5i!oNu{$d5&klP1XDMUbD$ASX?be*om486f - - - - - - wms_seq_check_relea - START WITH 1000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/CustomsOrderManager.class b/target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/CustomsOrderManager.class deleted file mode 100644 index a5bbd95596ae40d141cc75ab642c58a7dbef15d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11367 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/editReceivePage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/editReceivePage.xml deleted file mode 100644 index 4db7f43..0000000 --- a/target/jjwms/WEB-INF/classes/config/origen/delivery/editReceivePage.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml b/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml deleted file mode 100644 index 880f314..0000000 --- a/target/jjwms/WEB-INF/classes/config/origen/delivery/modifyArrivalReceivePage.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target/jjwms/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml b/target/jjwms/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml deleted file mode 100644 index 63b4ebe..0000000 --- a/target/jjwms/WEB-INF/classes/config/origen/receiving/maintainASNPage.xml +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - = {order.beginDate} ~/ - /~order.endDate: AND asn.orderDate <= {order.endDate} ~/ - /~receive.beginDate: AND asn.receivedDate >= {receive.beginDate} ~/ - /~receive.endDate: AND asn.receivedDate <= {receive.endDate} ~/ - /~asn.userName: AND asn.userName LIKE {asn.userName} ~/ order by asn.id desc]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -