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

no message

main
HUOJIN\92525 2024-08-16 14:55:57 +08:00
parent 780e782c9d
commit a73fe9f9f1
6 changed files with 10 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target/jjwms/WEB-INF/classes/config/origen/delivery/maintainReceiveBillFeePage.xml → src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveBillFee2Page.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages>
<maintainPage id="maintainReceiveBillFeePage" title="maintainReceiveBillFeePage" autoQuery="false">
<maintainPage id="maintainReceiveBillFee2Page" title="收款登记" autoQuery="false">
<search>
<inputUIs>
<text id="customsOrder.code" title="业务编号" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
@ -89,6 +89,7 @@
left join customsOrder.client
WHERE 1=1
and billFee.status in ('已审核')
and (billFee.invoiceNo is not null or billFee.courierNo is not null )
/~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/
/~customsOrder.client.id: and customsOrder.client.id = {customsOrder.client.id}~/
/~billFee.creatPeople: and upper(billFee.creatPeople) like upper({billFee.creatPeople})~/
@ -136,10 +137,8 @@
<buttons>
<popup id="receiveFeeLook" title="应收费用查看" enableType="single" invisible="false" containId="true" pageId="modifyReceiveFeeLookExaminePage">
</popup>
<popup id="invoiceDJ" title="发票登记" enableType="multi" invisible="false" containId="true" pageId="editInvoiceDjPage">
</popup>
<popup id="courierDJ" title="快递单号登记" enableType="multi" invisible="false" containId="true" pageId="editCourierDjPage">
</popup>
<popup id="collectionDJ" title="收款登记" enableType="multi" invisible="false" containId="true" pageId="editCollectionDjPage">
</popup>
<commit id="returncwdjBillfee" title="退回" enableType="multi" invisible="false" confirmMessage="确认是否退回?">

6
src/webapp/WEB-INF/classes/config/origen/delivery/maintainReceiveBillFeePage.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<pages>
<maintainPage id="maintainReceiveBillFeePage" title="maintainReceiveBillFeePage" autoQuery="false">
<maintainPage id="maintainReceiveBillFeePage" title="开票管理" autoQuery="false">
<search>
<inputUIs>
<text id="customsOrder.code" title="业务编号" row="1" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="true"/>
@ -89,6 +89,7 @@
left join customsOrder.client
WHERE 1=1
and billFee.status in ('已审核')
and (billFee.invoiceNo is null or billFee.courierNo is null )
/~customsOrder.code: and customsOrder.code like upper({customsOrder.code})~/
/~customsOrder.client.id: and customsOrder.client.id = {customsOrder.client.id}~/
/~billFee.creatPeople: and upper(billFee.creatPeople) like upper({billFee.creatPeople})~/
@ -140,8 +141,7 @@
</popup>
<popup id="courierDJ" title="快递单号登记" enableType="multi" invisible="false" containId="true" pageId="editCourierDjPage">
</popup>
<popup id="collectionDJ" title="收款登记" enableType="multi" invisible="false" containId="true" pageId="editCollectionDjPage">
</popup>
<commit id="returncwdjBillfee" title="退回" enableType="multi" invisible="false" confirmMessage="确认是否退回?">
<enableExpression><![CDATA[${billFee.status} == '已审核']]></enableExpression>
<mappings>

2
src/webapp/WEB-INF/classes/config/origen/delivery/package_zh.properties
View File

@ -32,7 +32,7 @@ fee.invoiceType=\u53d1\u7968\u7c7b\u578b
fee.paymentDate=\u4ed8\u6b3e\u65f6\u95f4
co.payMoney=\u5e94\u4ed8\u91d1\u989d\u6c47\u603b
maintainCKPayFeeSHPage=\u8d39\u7528\u5ba1\u6838
maintainReceiveBillFeePage=\u8d22\u52a1\u767b\u8bb0\u7ba1\u7406
maintainReceiveBillFeePage=\u5F00\u7968\u7BA1\u7406
modifyReceiveFeeSHPage=\u8d39\u7528\u5ba1\u6838
modifyReceiveFeeLookPage=\u5e94\u6536\u8d39\u7528\u67e5\u770b
editReceiveFeeLookPage=\u5e94\u6536\u8d39\u7528\u7ef4\u62a4

3
src/webapp/WEB-INF/classes/config/origen/menuConfig.xml
View File

@ -133,7 +133,8 @@
<menuItem title="maintainReceiveFeePage" pageId="maintainReceiveFeePage"/>
<menuItem title="maintainReceiveFeeExaminePage" pageId="maintainReceiveFeeExaminePage"/>
<menuItem title="maintainSaleConPage" pageId="maintainSaleConPage"/>
<menuItem title="maintainReceiveBillFeePage" pageId="maintainReceiveBillFeePage"/>
<menuItem title="开票管理" pageId="maintainReceiveBillFeePage"/>
<menuItem title="收款管理" pageId="maintainReceiveBillFee2Page"/>
<menuItem title="wtfBillFeeReportPage" pageId="wtfBillFeeReportPage"/>
<menuItem title="payOrReceiveFeeReportPage" pageId="payOrReceiveFeeReportPage"/>
</menuItem>

1
src/webapp/WEB-INF/classes/config/origen/report/reportLocationMapPage.xml
View File

@ -10,7 +10,6 @@
from WarehouseArea zone
where 1=1
and zone.disabled=0
and zone.warehouse = #{SESSION_WAREHOUSE}
and zone.code in ('AA','AH','BA','RC','RD','RE','D','RA','RB')
order by zone.code
]]></hql>

226
target/jjwms/WEB-INF/classes/config/origen/delivery/package_zh.properties
View File

@ -1,226 +0,0 @@
#modifyCustomsOrderFeePage
editSettlementExamine2Page=\u8865\u5f55\u72b6\u6001
editSettlementExaminePage=\u7ed3\u7b97\u5ba1\u6838
maintainSaleConPage=\u9500\u552e\u786e\u8ba4\u7ba1\u7406
editcustomerConPage=\u5ba2\u6237\u786e\u8ba4\u767b\u8bb0
editpicturePage=\u7167\u7247\u4e0a\u4f20
batchInput=\u6279\u91cf\u5f55\u5165\u5e94\u4ed8\u8d39\u7528
editbatchInputPage=\u5e94\u4ed8\u8d39\u7528\u5f55\u5165
modifyBillFeePayFeePage=\u5e94\u4ed8\u8d39\u7528\u67e5\u770b
modifyLooBillFeePage=\u5e94\u4ed8\u8d39\u7528\u67e5\u770b
maintainCOPayFeeSHPage=\u8d39\u7528\u5ba1\u6838
editReceiveFeeEditPage=\u5e94\u6536\u8d39\u7528\u7ef4\u62a4
maintainLooBillFeePage=\u5e94\u4ed8\u8d39\u7528\u67e5\u770b
editSpecialPage=\u7279\u6b8a\u4fee\u6539
editCollectionDjPage=\u6536\u6b3e\u767b\u8bb0
editInvoiceDjPage=\u53d1\u7968\u53f7\u767b\u8bb0
editCourierDjPage=\u5feb\u9012\u5355\u53f7\u767b\u8bb0
modifyReceiveFeeLookExaminePage=\u5e94\u6536\u8d39\u7528\u67e5\u770b
maintainReceiveFeeExaminePage=\u5e94\u6536\u8d39\u7528\u5ba1\u6838
maintainSpecialPayFeePage=\u7279\u6b8a\u5e94\u4ed8\u8d39\u7528\u7ba1\u7406
maintainVicePayFeePage=\u526f\u603b\u5e94\u4ed8\u8d39\u7528\u5ba1\u6838
maintainPresidentPayFeePage=\u603b\u7ecf\u7406\u5e94\u4ed8\u8d39\u7528\u5ba1\u6838
maintainLookCustomsPayFeePage=\u5e94\u4ed8\u8d39\u7528\u67e5\u770b
maintainLookCustomsPayFee2Page=\u5e94\u4ed8\u8d39\u7528\u67e5\u770b
editLookPicturePage=\u7167\u7247\u7ba1\u7406
modifyLookCustomsPayFeePage=\u5e94\u4ed8\u8d39\u7528\u67e5\u770b
editPaymentRegisterPage=\u4ed8\u6b3e\u767b\u8bb0
editInvoiceRegisterPage=\u53d1\u7968\u767b\u8bb0
fee.actualMoney=\u5b9e\u9645\u4ed8\u6b3e\u91d1\u989d
fee.invoiceNo=\u53d1\u7968\u53f7
fee.invoiceType=\u53d1\u7968\u7c7b\u578b
fee.paymentDate=\u4ed8\u6b3e\u65f6\u95f4
co.payMoney=\u5e94\u4ed8\u91d1\u989d\u6c47\u603b
maintainCKPayFeeSHPage=\u8d39\u7528\u5ba1\u6838
maintainReceiveBillFeePage=\u8d22\u52a1\u767b\u8bb0\u7ba1\u7406
modifyReceiveFeeSHPage=\u8d39\u7528\u5ba1\u6838
modifyReceiveFeeLookPage=\u5e94\u6536\u8d39\u7528\u67e5\u770b
editReceiveFeeLookPage=\u5e94\u6536\u8d39\u7528\u7ef4\u62a4
receiveMoney=\u5e94\u6536\u91d1\u989d
payMoney=\u5e94\u4ed8\u91d1\u989d
editReceiveFeePage=\u5e94\u6536\u8d39\u7528\u7ef4\u62a4
modifyReceiveFeePage=\u5e94\u6536\u8d39\u7528\u7ef4\u62a4
maintainReceiveFeePage=\u5e94\u6536\u8d39\u7528\u7ba1\u7406
maintainPayFeeSHPage=\u8d39\u7528\u5ba1\u6838
maintainPayFeePage=\u5e94\u4ed8\u8d39\u7528\u7ba1\u7406
fee.purpose=\u8d44\u91d1\u7528\u9014
fee.payment=\u652f\u4ed8\u65b9\u5f0f
modifyfeeDetailPage=\u8d39\u7528\u660e\u7ec6
crd.item.code=\u6781\u8fdb\u8d27\u53f7
editCheckReleaDetailPage=\u6838\u653e\u5355\u7f16\u8f91
warehousingListprint=\u5165\u5e93\u6e05\u5355\u6253\u5370
printWarehousingListPage=\u5165\u5e93\u6e05\u5355
modifyLocationRegistrationPage=\u5e93\u4f4d\u767b\u8bb0
editLocationRegistrationPage=\u5e93\u4f4d\u767b\u8bb0
editTransportOrderPage=\u59d4\u6258\u767b\u8bb0
editLicensePlatePage=\u65b0\u589e
editWaterListUploadPage=\u9644\u4ef6\u4e0a\u4f20-\u6c34\u5355
editCheckReleaUploadPage=\u9644\u4ef6\u4e0a\u4f20-\u6838\u653e\u5355
printCheckReleaPage=\u6838\u653e\u5355\u6253\u5370
crd.id=\u5e8f\u53f7
modifyPickTicketPhotoPage=\u51fa\u5e93\u76f8\u7247\u4e0a\u4f20
modifyPhotoUploadPage=\u8f66\u8f86\u56fe\u7247\u4e0a\u4f20
crd.declareQty=\u7533\u62a5\u6570\u91cf
crd.grossWeight=\u8d27\u7269\u6bdb\u91cd
crd.weight=\u8d27\u7269\u51c0\u91cd
crd.item.code=\u5546\u54c1\u6599\u53f7
crd.serialNumber=\u5173\u8054\u5546\u54c1\u5e8f\u53f7
crd.item.itemCode=\u5546\u54c1\u7f16\u7801
crd.item.name=\u5546\u54c1\u540d\u79f0
crd.declareUnit.unit=\u5355\u4f4d
crd.description=\u5907\u6ce8
addTwoCheckReleaDetailPage=\u6dfb\u52a0\u660e\u7ec6
modifyPickInvoiceBoxPage=\u6838\u653e\u5355\u767b\u8bb0
editTwoCheckReleaDetailPage=\u6838\u653e\u5355\u7ef4\u62a4
checkRelea.checkCode=\u6838\u653e\u5355\u53f7\u7801
l.licensetype=\u767b\u8bb0\u7c7b\u578b
l.vehicleWeight=\u8f66\u81ea\u91cd
editPickTicketReceivePage=\u51fa\u5e93\u767b\u8bb0
arrivalPickTicket=\u51fa\u5e93\u767b\u8bb0
l.frameNo=\u8f66\u67b6\u53f7
l.frameWeight=\u8f66\u67b6\u91cd
l.containBox=\u96c6\u88c5\u7bb1\u53f7
l.titleNo=\u94c5\u5c01\u53f7
checkRelea.dock.code=\u4f5c\u4e1a\u5e73\u53f0
checkRelea.worker1.name=\u7406\u8d27\u5458
checkRelea.worker2.name=\u52a8\u529b\u4eba\u5458
checkRelea.worker3.name=\u4ed3\u5e93\u6d3e\u5355\u5458
editReceivePage=\u767b\u8bb0\u4fe1\u606f
checkRelea.titleNo=\u5c01\u53f7
modifyArrivalReceivePage=\u5230\u8d27\u767b\u8bb0
checkRelea.telephone=\u7535\u8bdd
customsOrder.temperature=\u6e29\u5ea6\u8981\u6c42
customsOrder.extendDouble1=\u6563\u8d27\u5355\u4ef7
customsOrder.extendDouble2=\u6563\u8d27\u6570\u91cf
customsOrder.extendDouble3=\u5927\u67dc\u5355\u4ef7
customsOrder.extendDouble4=\u5927\u67dc\u6570\u91cf
customsOrder.extendDouble5=\u5c0f\u67dc\u5355\u4ef7
customsOrder.extendDouble6=\u5c0f\u67dc\u6570\u91cf
customsOrder.extendDouble7=\u603b\u4ef7
c.extend5=\u6838\u6ce8\u6e05\u5355\u53f7
crd.itemNo=\u5546\u54c1\u6599\u53f7
crd.grossWeight=\u8d27\u7269\u6bdb\u91cd
crd.weight=\u8d27\u7269\u51c0\u91cd
fee.price=\u5355\u4ef7
crd.declareQty=\u7533\u62a5\u6570\u91cf
crd.description=\u5907\u6ce8
b.bxModel=\u7bb1\u578b
editDJSHQDPage=\u6838\u6ce8\u6e05\u5355
editBGCYFSPage=\u67e5\u9a8c\u7c7b\u578b
customsOrder.fleet.name=\u8f66\u961f
customsOrder.requirements=\u9001\u8d27\u8981\u6c42
maintainFinancePage=\u8d22\u52a1\u7ba1\u7406
crd.serialNumber=\u5173\u8054\u5546\u54c1\u5e8f\u53f7
crd.itemCode=\u5546\u54c1\u7f16\u7801
modifyBoxNOPage=\u6dfb\u52a0\u7bb1\u5c01\u53f7
crd.itemName=\u5546\u54c1\u540d\u79f0
b.name=\u7bb1\u53f7
crd.declareUnit.unit=\u7533\u62a5\u5355\u4f4d
checkReleaRegister=\u6838\u653e\u5355\u767b\u8bb0
modifyCheckReleaRegisterPage=\u6838\u653e\u5355\u767b\u8bb0
printcheckRelea=\u6838\u653e\u5355\u6253\u5370
modifyCustomsOrderFeePage=\u8d39\u7528\u5f55\u5165
customsOrderFee=\u5e94\u6536\u5f55\u5165
customsOrderPayFee=\u5e94\u4ed8\u5f55\u5165
customsOrder.address3=\u9001\u8d27\u5730\u70b9
customsOrder.person3=\u9001\u8d27\u8054\u7cfb\u4eba
customsOrder.telephone3=\u9001\u8d27\u7535\u8bdd
maintainOrderPage.newOrderButton=\u65b0\u5efa
maintainOrderPage.selectOrderButton=\u4fee\u6539
maintainMotorcadePage=\u8f66\u961f\u4fe1\u606f
deleteOrderFee=\u5220\u9664
fee.feeName=\u8d39\u7528\u9879\u76ee
customsOrder.status=\u72b6\u6001
customsOrder.extend1=\u4e3b\u7ba1\u5ba1\u6838
customsOrder.extendDate1=\u4e3b\u7ba1\u5ba1\u6838\u65e5\u671f
customsOrder.extend2=\u8d22\u52a1\u5ba1\u6838
customsOrder.extendDate2=\u8d22\u52a1\u5ba1\u6838\u65e5\u671f
printhyd=\u6253\u5370\u8fd0\u8f93\u5355
modifyBoxNOXHPage=\u7bb1\u91cf
fee.company.name=\u5f80\u6765\u5355\u4f4d
saveOrderDetailButton=\u4fdd\u5b58
editInputOrderFeePage=\u8d39\u7528\u7ef4\u62a4
editInputOrderPayFeePage=\u5e94\u4ed8\u8d39\u7528\u7ef4\u62a4
fee.bz=\u5e01\u79cd
l.license=\u8f66\u724c
editYXFXPage=\u4e00\u7ebf\u653e\u884c
c.extend8=\u62a5\u5173\u5355\u53f7
c.extend14=\u67e5\u9a8c\u65b9\u5f0f
maintainTransportOrderPage=\u4e00\u7ebf\u8fd0\u8f93\u59d4\u6258
#maintainDeliveryPlanPage
planActive=\u8ba1\u5212\u5206\u89e3
modify=\u4fee\u6539
new=\u65b0\u5efa
maintainDeliveryPlanPage.deliveryPlan.project=\u9879\u76ee\u540d\u79f0
deliveryPlan.company.name=\u4e8b\u4e1a\u90e8
deliveryPlan.id=\u5e8f\u53f7
deliveryPlan.company.id=\u4e8b\u4e1a\u90e8
#modifyDeliveryPlanPage
dpd.project=\u9879\u76ee
checkRelea.id=\u5e8f\u53f7
checkRelea.type=\u7c7b\u578b
checkRelea.exitSign=\u8fdb\u51fa\u53e3\u6807\u8bb0
checkRelea.bindType=\u7ed1\u5b9a\u7c7b\u578b
checkRelea.documentType=\u5173\u8054\u5355\u8bc1\u7c7b\u578b
checkRelea.license=\u627f\u8fd0\u8f66\u8f66\u724c\u53f7
checkRelea.containNo=\u96c6\u88c5\u7bb1\u53f7
checkRelea.documentNo=\u5355\u8bc1\u7f16\u53f7
checkRelea.frameNo=\u8f66\u67b6\u53f7
checkRelea.vehicleWeight=\u8f66\u81ea\u91cd
checkRelea.frameWeight=\u8f66\u67b6\u91cd
checkRelea.containWeight=\u96c6\u88c5\u7bb1\u91cd
checkRelea.containBox=\u96c6\u88c5\u7bb1\u7bb1\u578b
checkRelea.totalWeight=\u603b\u91cd\u91cf
checkRelea.totalGrossWeight=\u8d27\u7269\u603b\u6bdb\u91cd
checkRelea.totalNetWeight=\u8d27\u7269\u603b\u51c0\u91cd
checkRelea.description=\u5907\u6ce8
confirm.delete=\u786e\u8ba4\u5220\u9664\u9009\u4e2d\u6570\u636e?
dpd.lineNo=\u884c\u53f7
dpd.item=\u8d27\u54c1
dpd.packageUnit.id=\u5305\u88c5\u5355\u4f4d
dpd.item.code=\u8d27\u54c1\u4ee3\u7801
dpd.item.name=\u8d27\u54c1\u540d\u79f0
dpd.packageUnit.unit=\u5305\u88c5\u5355\u4f4d
dpd.expectedQuantity=\u6570\u91cf
dpd.station=\u5de5\u4f4d
dpd.quantity=\u5b9e\u9645\u6570\u91cf
dpd.planDate=\u8ba1\u5212\u65f6\u95f4
dpd.warehouse=\u5e93\u7ba1\u7ec4
dpd.workGroup=\u914d\u9001\u73ed
dpd.description=\u63cf\u8ff0
modifyDeliveryPlanPage=\u914d\u9001\u8ba1\u5212\u7f16\u8f91
editDeliveryPlanDetailPage=\u914d\u9001\u8ba1\u5212\u660e\u7ec6\u7f16\u8f91
maintainExecutePlanPage=\u6267\u884c\u8ba1\u5212\u7ba1\u7406
executePlan.deliveryPlan.code=\u914d\u9001\u8ba1\u5212\u53f7
executePlan.lineNo=\u884c\u53f7
executePlan.planDate=\u8ba1\u5212\u65f6\u95f4
executePlan.expectedQuantity=\u8ba1\u5212\u6570\u91cf
executePlan.quantity=\u5b9e\u9645\u6570\u91cf
executePlan.status=\u72b6\u6001
executePlan.warehouseWork=\u5e93\u7ba1\u7ec4
executePlan.workGroup=\u914d\u9001\u73ed
executePlan.station=\u5de5\u4f4d
executePlan.pickTicket=\u53d1\u8d27\u5355\u53f7
executePlan.description=\u63cf\u8ff0
executePlan.warehouse.name=\u4ed3\u5e93
executePlan.code=\u4ee3\u7801
downPick=\u8ba1\u5212\u4e0b\u653e
modifyExecutePlanPage=\u6267\u884c\u8ba1\u5212\u7f16\u8f91
executePlan.warehouse.id=\u4ed3\u5e93
executePlan.deliveryPlan.id=\u914d\u9001\u8ba1\u5212
editExecutePlanDetailPage=\u6267\u884c\u8ba1\u5212\u660e\u7ec6\u7f16\u8f91
b.id=\u5e8f\u53f7
b.code=\u6d41\u6c34\u53f7
b.titleNo=\u5c01\u53f7
b.boxSize=\u5927\u5c0f
b.unloadingDay=\u5378\u8d27\u65e5\u671f
b.carrier=\u627f\u8fd0\u5546
b.quantity=\u6570\u91cf
b.description=\u63cf\u8ff0
editBoxNOPage=\u7bb1\u578b\u7ef4\u62a4
createAsn=\u751f\u6210\u5165\u5e93
maintainAddCheckDetailPage=\u6dfb\u52a0\u660e\u7ec6