huojin
/
jjwms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-08-20 15:44:56 +08:00
parent 88266f055c
commit 9d58d360fa
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java
View File

@ -2279,21 +2279,21 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
//FeeType ft=commonDao.load(FeeType.class, 2010L); //FeeType ft=commonDao.load(FeeType.class, 2010L);
//FeeType ft=commonDao.load(FeeType.class, 4221L); //FeeType ft=commonDao.load(FeeType.class, 4221L);
Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble1(),invoiceBox.getExtendDouble2()); Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble1(),invoiceBox.getExtendDouble2());
f.setDescription(invoiceBox.getExtend5()+" 散货"); f.setDescription(invoiceBox.getExtend5()+" 散货 "+invoiceBox.getFromAddress());
saveFee(f,invoiceBox.getId(),"INVOICEBOX"); saveFee(f,invoiceBox.getId(),"INVOICEBOX");
} }
if(invoiceBox.getExtendDouble11()>0&&invoiceBox.getExtendDouble12()>0) { if(invoiceBox.getExtendDouble11()>0&&invoiceBox.getExtendDouble12()>0) {
//FeeType ft=commonDao.load(FeeType.class, 2010L); //FeeType ft=commonDao.load(FeeType.class, 2010L);
//FeeType ft=commonDao.load(FeeType.class, 4221L); //FeeType ft=commonDao.load(FeeType.class, 4221L);
Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble11(),invoiceBox.getExtendDouble12()); Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble11(),invoiceBox.getExtendDouble12());
f.setDescription(invoiceBox.getExtend5()+" 大柜"); f.setDescription(invoiceBox.getExtend5()+" 大柜 "+invoiceBox.getFromAddress());
saveFee(f,invoiceBox.getId(),"INVOICEBOX"); saveFee(f,invoiceBox.getId(),"INVOICEBOX");
} }
if(invoiceBox.getExtendDouble13()>0&&invoiceBox.getExtendDouble14()>0) { if(invoiceBox.getExtendDouble13()>0&&invoiceBox.getExtendDouble14()>0) {
//FeeType ft=commonDao.load(FeeType.class, 2010L); //FeeType ft=commonDao.load(FeeType.class, 2010L);
//FeeType ft=commonDao.load(FeeType.class, 4221L); //FeeType ft=commonDao.load(FeeType.class, 4221L);
Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble13(),invoiceBox.getExtendDouble14()); Fee f=creatFee(invoiceBox,ft,invoiceBox.getExtendDouble13(),invoiceBox.getExtendDouble14());
f.setDescription(invoiceBox.getExtend5()+" 小柜"); f.setDescription(invoiceBox.getExtend5()+" 小柜 "+invoiceBox.getFromAddress());
saveFee(f,invoiceBox.getId(),"INVOICEBOX"); saveFee(f,invoiceBox.getId(),"INVOICEBOX");
} }
} }

13
src/webapp/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml
View File

@ -1,8 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<pages> <pages>
<reportPage id="reportLocationZyPage" title="库位占用图" reportFile="jj_kuweizanyong_report.raq" parameter="s_id,code,itemCode,date1,date2,warehouse=#{SESSION_WAREHOUSE}"> <reportPage id="reportLocationZyPage" title="库位占用图" reportFile="jj_kuweizanyong_report.raq" parameter="id,code,itemCode,date1,date2,warehouse=#{SESSION_WAREHOUSE}">
<inputUIs> <inputUIs>
<list id="id" title="库区" row="1" col="1" span="1" width="120" readOnly="false" required="true" reserve="false" forceOverride="true" >
<hql><![CDATA[ select
zone.id,
zone.code
from WarehouseArea zone
where 1=1
and zone.disabled=0
and zone.code in ('AA','AH','BA','RC','RD','RE','D','RA','RB')
order by zone.code
]]></hql>
</list>
</inputUIs> </inputUIs>
</reportPage> </reportPage>

BIN
target/jjwms/WEB-INF/classes/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.class
View File

Binary file not shown.

9
target/jjwms/WEB-INF/classes/config/origen/report/reportLocationZyPage.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages>
<reportPage id="reportLocationZyPage" title="库位占用图" reportFile="jj_kuweizanyong_report.raq" parameter="s_id,code,itemCode,date1,date2,warehouse=#{SESSION_WAREHOUSE}">
<inputUIs>
</inputUIs>
</reportPage>
</pages>