Compare commits
No commits in common. "main" and "sdInAndOutDetailRepotr" have entirely different histories.
|
|
@ -229,13 +229,34 @@ public interface ASNManager extends BaseManager{
|
|||
@Transactional
|
||||
void importXLMASN(File file);
|
||||
|
||||
//泰普尔线上入库
|
||||
//泰普尔线上
|
||||
@Transactional
|
||||
void importASN2(File file);
|
||||
|
||||
//出入库通用模板导入-入库
|
||||
//泰普尔出库入库导入
|
||||
@Transactional
|
||||
void inAndOutImport(File file,String type);
|
||||
void crkImport(File file,String type);
|
||||
|
||||
//丝涟出库入库导入
|
||||
@Transactional
|
||||
void sealyImport(File file,String type);
|
||||
|
||||
//智筑出库入库导入
|
||||
@Transactional
|
||||
void zhizhuImport(File file,String type);
|
||||
|
||||
//Emma出库入库导入
|
||||
@Transactional
|
||||
void emmaImport(File file,String type);
|
||||
|
||||
|
||||
//舒达入库导入
|
||||
@Transactional
|
||||
void sertaImport(File file);
|
||||
|
||||
//星侃入库导入
|
||||
@Transactional
|
||||
void xingkanImport(File file);
|
||||
|
||||
//一键收货
|
||||
@Transactional
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -347,7 +347,7 @@ public interface PickTicketManager extends BaseManager {
|
|||
@Transactional
|
||||
void importPickTicket(File file);
|
||||
|
||||
//泰普尔线下导入
|
||||
//线下导入
|
||||
@Transactional
|
||||
void importPickTicketTP(File file);
|
||||
|
||||
|
|
@ -359,9 +359,21 @@ public interface PickTicketManager extends BaseManager {
|
|||
@Transactional
|
||||
void importPickTicketTP2(File file);
|
||||
|
||||
//出库入导入-出库
|
||||
//泰普尔-线下出入库导入
|
||||
@Transactional
|
||||
void inAndOutImport(File file,String type);
|
||||
void issuereceiptImport(File file,String type);
|
||||
|
||||
//丝涟出入库导入
|
||||
@Transactional
|
||||
void sealyPtImport(File file,String type);
|
||||
|
||||
//智筑出入库导入
|
||||
@Transactional
|
||||
void zhiZhuPtImport(File file,String type);
|
||||
|
||||
//Emma出入库导入
|
||||
@Transactional
|
||||
void emmaPtImport(File file,String type);
|
||||
|
||||
//手工分配
|
||||
@Transactional
|
||||
|
|
@ -371,6 +383,10 @@ public interface PickTicketManager extends BaseManager {
|
|||
@Transactional
|
||||
void cancellAllocate(List<Long> ids);
|
||||
|
||||
//舒达出入库导入
|
||||
@Transactional
|
||||
void sertaImport(File file);
|
||||
|
||||
//星侃出入库导入
|
||||
@Transactional
|
||||
void xinKanImport(File file);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -53,7 +53,7 @@
|
|||
<menuItem title="maintainMLILYBHASNPage" pageId="maintainMLILYBHASNPage"/>
|
||||
<menuItem title="maintainJTZSASNPage" pageId="maintainJTZSASNPage"/>
|
||||
<menuItem title="maintainXLMJXSASNPage" pageId="maintainXLMJXSASNPage"/>
|
||||
<menuItem title="慕思" pageId="maintainZhizhuASNPage"/>
|
||||
<menuItem title="maintainZhizhuASNPage" pageId="maintainZhizhuASNPage"/>
|
||||
<menuItem title="maintainSealyASNPage" pageId="maintainSealyASNPage"/>
|
||||
<menuItem title="maintainEmmaASNPage" pageId="maintainEmmaASNPage"/>
|
||||
<menuItem title="芝华仕沙发" pageId="maintainCHEERSASNPage"/>
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
<menuItem title="maintainMLILYBHPickTicketPage" pageId="maintainMLILYBHPickTicketPage"/>
|
||||
<menuItem title="聚通装饰" pageId="maintainJTZSPickTicketPage"/>
|
||||
<menuItem title="喜临门经销商" pageId="maintainXLMJXSPickTicketPage"/>
|
||||
<menuItem title="慕思" pageId="maintainZhizhuPickTicketPage"/>
|
||||
<menuItem title="智筑建材" pageId="maintainZhizhuPickTicketPage"/>
|
||||
<menuItem title="丝涟床垫" pageId="maintainSealyPickTicketPage"/>
|
||||
<menuItem title="Emma" pageId="maintainEmmaPickTicketPage"/>
|
||||
<menuItem title="芝华仕沙发" pageId="maintainCHEERSPickTicketPage"/>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="asnManager" methodName="crkImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="asnManager" methodName="crkImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="asnManager" methodName="emmaImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="asnManager" methodName="sealyImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="editXingkanImportImportASNPage" title="crkImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<editPage id="editXingkanImportImportASNPage" title="出入库模板导入" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="asnManager" methodName="xingkanImport" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="asnManager" methodName="zhizhuImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
LEFT JOIN asn.dock dock
|
||||
WHERE 1=1
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id in (7,40,41)
|
||||
and company.id=7
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
WHERE 1=1
|
||||
and asn.beLine=1
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id in (1,39)
|
||||
and company.id=1
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@
|
|||
WHERE 1=1
|
||||
and asn.beLine=0
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id in (1,39)
|
||||
and company.id=1
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
WHERE 1=1
|
||||
and asn.beLine=0
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id=19
|
||||
and company.id=5
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ editEmmaASNPage=Emma\u8BA2\u5355
|
|||
editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165
|
||||
maintainSealyASNPage=\u4e1d\u6d9f
|
||||
editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355
|
||||
maintainZhizhuASNPage=\u6155\u601D
|
||||
maintainZhizhuASNPage=\u667a\u7b51
|
||||
editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355
|
||||
maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546
|
||||
editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355
|
||||
|
|
|
|||
|
|
@ -5,16 +5,14 @@
|
|||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="asnManager" methodName="sertaImport" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<pages>
|
||||
<reportPage id="sdInAndOutDetailRepotr" title="库存进出明细" reportFile="sdInAndOutDetail2.raq" parameter="kh,customerNo,itemName,date1,date2,warehouse=#{SESSION_WAREHOUSE}">
|
||||
<reportPage id="sdInAndOutDetailRepotr" title="库存进出明细" reportFile="sdInAndOutDetail2.raq" parameter="s_id,customerNo,itemName,date1,date2,warehouse=#{SESSION_WAREHOUSE}">
|
||||
<inputUIs>
|
||||
<list id="kh" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="true" reserve="false" forceOverride="true">
|
||||
<list id="s_id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="true" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[select company.id, company.name from Structure company
|
||||
where company.beCompany = true
|
||||
and company.disabled=false
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="editSealyPtImport" title="issuereceiptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<editPage id="editSealyPtImport" title="editSealyPtImport" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="pickTicketManager" methodName="sealyPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="emmaPtImportPage" title="issuereceiptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<editPage id="emmaPtImportPage" title="emmaPtImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="pickTicketManager" methodName="emmaPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="sbw"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="importPickTicketTPCus" parameter="imageFile"/>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="sbw"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="importPickTicketTP" parameter="imageFile"/>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="pickTicketManager" methodName="issuereceiptImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="pickTicketManager" methodName="issuereceiptImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -66,7 +66,8 @@
|
|||
left join pickTicket.company company
|
||||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and company.id in (7,40,41)
|
||||
and company.id=7
|
||||
and company.beCompany=true
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
|
|
|
|||
|
|
@ -67,7 +67,8 @@
|
|||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and pickTicket.beLine=1
|
||||
and company.id in (1,39)
|
||||
and company.beCompany=true
|
||||
and company.id=1
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
|
|
|
|||
|
|
@ -68,7 +68,8 @@
|
|||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and pickTicket.beLine=0
|
||||
and company.id in (1,39)
|
||||
and company.beCompany=true
|
||||
and company.id=1
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainZhizhuPickTicketPage" title="慕思" autoQuery="false">
|
||||
<maintainPage id="maintainZhizhuPickTicketPage" title="智筑建材" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true">
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
left join pickTicket.company company
|
||||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and company.id=19
|
||||
and company.id=5
|
||||
and company.beCompany=true
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
|
|
|
|||
|
|
@ -1,21 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="sertaImportPage" title="issuereceiptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<editPage id="sertaImportPage" title="sertaImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="pickTicketManager" methodName="sertaImport" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="xinKanImportPage" title="issuereceiptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<editPage id="xinKanImportPage" title="xinKanImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
|
|
@ -12,10 +12,10 @@
|
|||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="pickTicketManager" methodName="emmaPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="zhiZhuptImportPage" title="issuereceiptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<editPage id="zhiZhuptImportPage" title="zhiZhuptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inAndOutImport" parameter="imageFile,type"/>
|
||||
<action managerName="pickTicketManager" methodName="zhiZhuPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
<menuItem title="maintainMLILYBHASNPage" pageId="maintainMLILYBHASNPage"/>
|
||||
<menuItem title="maintainJTZSASNPage" pageId="maintainJTZSASNPage"/>
|
||||
<menuItem title="maintainXLMJXSASNPage" pageId="maintainXLMJXSASNPage"/>
|
||||
<menuItem title="慕思" pageId="maintainZhizhuASNPage"/>
|
||||
<menuItem title="maintainZhizhuASNPage" pageId="maintainZhizhuASNPage"/>
|
||||
<menuItem title="maintainSealyASNPage" pageId="maintainSealyASNPage"/>
|
||||
<menuItem title="maintainEmmaASNPage" pageId="maintainEmmaASNPage"/>
|
||||
<menuItem title="芝华仕沙发" pageId="maintainCHEERSASNPage"/>
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
<menuItem title="maintainMLILYBHPickTicketPage" pageId="maintainMLILYBHPickTicketPage"/>
|
||||
<menuItem title="聚通装饰" pageId="maintainJTZSPickTicketPage"/>
|
||||
<menuItem title="喜临门经销商" pageId="maintainXLMJXSPickTicketPage"/>
|
||||
<menuItem title="慕思" pageId="maintainZhizhuPickTicketPage"/>
|
||||
<menuItem title="智筑建材" pageId="maintainZhizhuPickTicketPage"/>
|
||||
<menuItem title="丝涟床垫" pageId="maintainSealyPickTicketPage"/>
|
||||
<menuItem title="Emma" pageId="maintainEmmaPickTicketPage"/>
|
||||
<menuItem title="芝华仕沙发" pageId="maintainCHEERSPickTicketPage"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="crkImportPage" title="crkImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="crkImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="crkImportXSPage" title="crkImportXSPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线上" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="1" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="crkImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="editEmmaImport" title="editEmmaImport" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="emmaImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="editSealyImport" title="editSealyImport" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="sealyImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="editXingkanImportImportASNPage" title="出入库模板导入" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="xingkanImport" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="editZhizhuImport" title="editZhizhuImport" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="zhizhuImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
LEFT JOIN asn.dock dock
|
||||
WHERE 1=1
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id in (7,40,41)
|
||||
and company.id=7
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,223 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainTempurASN2Page" title="maintainTempurASN2Page" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<list id="asn.company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="true" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[select company.id, company.name from Structure company
|
||||
where company.beCompany = true
|
||||
and company.disabled=false
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
]]></hql>
|
||||
</list>
|
||||
<list id="asn.status" title="asn.status" row="1" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="ASNStatus">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue FROM Enumerate enumerate
|
||||
WHERE enumerate.enumType = 'ASNStatus']]></hql>
|
||||
</list>
|
||||
<text id="asn.code" title="asn.code" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<text id="asn.relatedBill1" title="入库通知单编号" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<dateRanger id="order.date" title="asn.orderDate" row="3" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="order.beginDate" toDate="order.endDate"/>
|
||||
<dateRanger id="receive.date" title="asn.receivedDate" row="4" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="receive.beginDate" toDate="receive.endDate"/>
|
||||
<text id="asn.userName" title="asn.userName" row="5" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
|
||||
<checkbox id="ordersAll" title="是否显示全部" row="6" col="1" defaultValue="false"
|
||||
span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||
|
||||
</inputUIs>
|
||||
</search>
|
||||
<datasource type="hql"><![CDATA[SELECT asn.id,
|
||||
company.name,
|
||||
asn.code,
|
||||
asn.billType.name,
|
||||
asn.relatedBill1,
|
||||
asn.status,
|
||||
asn.orderDate,
|
||||
asn.expectedQuantity,
|
||||
asn.receivedQuantity,
|
||||
asn.receivedDate,
|
||||
asn.billType.code,
|
||||
dock.id
|
||||
FROM ASN asn
|
||||
LEFT JOIN asn.company company
|
||||
LEFT JOIN asn.dock dock
|
||||
WHERE 1=1
|
||||
and asn.beLine=1
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id=1
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
/~SESSION_WAREHOUSE: AND asn.warehouse = #{SESSION_WAREHOUSE} ~/
|
||||
/~asn.company.id: AND asn.company.id = {asn.company.id} ~/
|
||||
/~asn.status: AND asn.status = {asn.status} ~/
|
||||
/~asn.code: AND asn.code like {asn.code} ~/
|
||||
/~asn.relatedBill1: AND asn.relatedBill1 like {asn.relatedBill1} ~/
|
||||
/~order.beginDate: AND asn.orderDate >= {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.orderDate desc ]]></datasource>
|
||||
<columns>
|
||||
<column id="asn.id" title="asn.id" visible="false"/>
|
||||
<column id="asn.company.name" title="asn.company" visible="true" horizonAlign="left"/>
|
||||
<column id="asn.code" title="asn.code" visible="true" horizonAlign="left" sortIndex="1" />
|
||||
<column id="asn.billType.name" title="asn.billType" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="asn.relatedBill1" title="入库通知单编号" visible="true" horizonAlign="left"/>
|
||||
<column id="asn.status" title="asn.status" visible="true" horizonAlign="left" dataType="enum" format="enumFormat" formatParam="ASNStatus"/>
|
||||
<column id="asn.orderDate" title="asn.orderDate" visible="true" horizonAlign="left" dataType="date"/>
|
||||
<column id="asn.expectedQuantity" title="asn.expectedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="asn.receivedQuantity" title="asn.receivedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="asn.receivedDate" title="asn.receivedDate" visible="true" horizonAlign="left" dataType="date"/>
|
||||
<column id="asn.billType.code" title="maintainASNPage.asn.billType.code" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="dock.id" title="asn.dock" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editASNTPE2Page"/>
|
||||
<popup id="modify" title="edit" enableType="single" invisible="false" containId="true" pageId="editASNTPE2Page"/>
|
||||
<commit id="delete" title="delete" enableType="multi" invisible="false" confirmMessage="maintainASNPage.maintainReceivingDocPage.confirm.delete">
|
||||
<enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="deleteAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="cancel" title="cancel" enableType="multi" invisible="false" confirmMessage="maintainASNPage.maintainReceivingDocPage.confirm.cancel">
|
||||
<enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="cancelAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <popup id="willReceive" title="maintainASNPage.willReceive" enableType="multi" invisible="false" containId="true" pageId="editWillReceivePage"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<commit id="active" title="active" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="activeAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="inactive" title="inactive" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${asn.status}=='ACTIVE')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inactiveAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="oneKeyReceive" title="oneKeyReceive" enableType="multi" invisible="false" confirmMessage="确认是否一键收货?" >
|
||||
<enableExpression><![CDATA[(${asn.status}=='ACTIVE')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="oneKeyReceive" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="receiveConfirm" title="receive" enableType="single" invisible="false" containId="true" pageId="asnReceiveConfirmPage">
|
||||
<!-- <enableExpression><![CDATA[ (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
|
||||
</popup>
|
||||
<!-- <popup id="receiveConfirmImport" title="receiveConfirmImport" enableType="single" invisible="false" containId="true" pageId="editImportASNReceiveConfirmPage"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.billType.code} != 'PO_STRAIGHT') && (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<popup id="receiveBack" title="receiveBack" enableType="single" invisible="false" containId="true" pageId="asnAdjustReceivingDocPage">
|
||||
<enableExpression><![CDATA[(${asn.status}=='RECEIVING' || ${asn.status} =='RECEIVED' || ${asn.status} =='CLOSE')]]></enableExpression>
|
||||
</popup>
|
||||
<!-- <popup id="quality" title="quality" enableType="single" invisible="false" containId="true" pageId="editASNQualityPage"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.status}=='RECEIVING' || ${asn.status}=='RECEIVED')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<!-- <commit id="createMoveDoc" title="maintainReceivingDocPage.createMoveDoc" enableType="single" invisible="false" confirmMessage="maintainReceivingDocPage.createMoveDoc.confirm"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.status} =='RECEIVING' || ${asn.status} =='RECEIVED')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="createMoveDocByASN" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="receiveOver" title="maintainASNPage.receiveOver" enableType="multi" invisible="false"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.status} == 'RECEIVING' || ${asn.status}=='RECEIVED' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="receiveOver" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="virInOutput" title="maintainASNPage.virInOutput" enableType="multi" invisible="true" confirmMessage="maintainASNPage.virInOutput.confirmMessage"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.billType.code}=='PO_STRAIGHT' && ${asn.status}=='ACTIVE')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="virInOutputStock" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="ZZRK" title="ZZRK" enableType="multi" invisible="true"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.billType.code}=='PO_TRANSFER' && ${asn.status}=='ACTIVE')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="transitInStock" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="ZZCK" title="ZZCK" enableType="multi" invisible="true"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.billType.code}=='PO_TRANSFER' && ${asn.status}=='RECEIVED')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="transitOutStock" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<popup id="viewReceivedRecord" title="maintainASNPage.viewReceivedRecord" enableType="single" invisible="false" containId="true" pageId="modifityReceivedRecordPage">
|
||||
<enableExpression><![CDATA[${asn.status} != 'OPEN' && ${asn.status} != 'ACTIVE' && ${asn.status} != 'CANCEL']]></enableExpression>
|
||||
</popup>
|
||||
<popup id="importASN2" title="importASN2" enableType="none" invisible="false" containId="true" pageId="importASN2Page"/>
|
||||
<popup id="crkImport" title="出入库模板导入" enableType="none" invisible="false" containId="true" pageId="crkImportXSPage"/>
|
||||
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,223 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainTempurASNPage" title="maintainTempurASNPage" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<list id="asn.company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="true" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[select company.id, company.name from Structure company
|
||||
where company.beCompany = true
|
||||
and company.disabled=false
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
]]></hql>
|
||||
</list>
|
||||
<list id="asn.status" title="asn.status" row="1" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="ASNStatus">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue FROM Enumerate enumerate
|
||||
WHERE enumerate.enumType = 'ASNStatus']]></hql>
|
||||
</list>
|
||||
<text id="asn.code" title="asn.code" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<text id="asn.relatedBill1" title="入库通知单编号" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<dateRanger id="order.date" title="asn.orderDate" row="3" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="order.beginDate" toDate="order.endDate"/>
|
||||
<dateRanger id="receive.date" title="asn.receivedDate" row="4" span="3" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="receive.beginDate" toDate="receive.endDate"/>
|
||||
<text id="asn.userName" title="asn.userName" row="5" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
|
||||
<checkbox id="ordersAll" title="是否显示全部" row="6" col="1" defaultValue="false"
|
||||
span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||
|
||||
</inputUIs>
|
||||
</search>
|
||||
<datasource type="hql"><![CDATA[SELECT asn.id,
|
||||
company.name,
|
||||
asn.code,
|
||||
asn.billType.name,
|
||||
asn.relatedBill1,
|
||||
asn.status,
|
||||
asn.orderDate,
|
||||
asn.expectedQuantity,
|
||||
asn.receivedQuantity,
|
||||
asn.receivedDate,
|
||||
asn.billType.code,
|
||||
dock.id
|
||||
FROM ASN asn
|
||||
LEFT JOIN asn.company company
|
||||
LEFT JOIN asn.dock dock
|
||||
WHERE 1=1
|
||||
and asn.beLine=0
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id=1
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
/~SESSION_WAREHOUSE: AND asn.warehouse = #{SESSION_WAREHOUSE} ~/
|
||||
/~asn.company.id: AND asn.company.id = {asn.company.id} ~/
|
||||
/~asn.status: AND asn.status = {asn.status} ~/
|
||||
/~asn.code: AND asn.code like {asn.code} ~/
|
||||
/~asn.relatedBill1: AND asn.relatedBill1 like {asn.relatedBill1} ~/
|
||||
/~order.beginDate: AND asn.orderDate >= {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.orderDate desc ]]></datasource>
|
||||
<columns>
|
||||
<column id="asn.id" title="asn.id" visible="false"/>
|
||||
<column id="asn.company.name" title="asn.company" visible="true" horizonAlign="left"/>
|
||||
<column id="asn.code" title="asn.code" visible="true" horizonAlign="left" sortIndex="1" />
|
||||
<column id="asn.billType.name" title="asn.billType" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="asn.relatedBill1" title="入库通知单编号" visible="true" horizonAlign="left"/>
|
||||
<column id="asn.status" title="asn.status" visible="true" horizonAlign="left" dataType="enum" format="enumFormat" formatParam="ASNStatus"/>
|
||||
<column id="asn.orderDate" title="asn.orderDate" visible="true" horizonAlign="left" dataType="date"/>
|
||||
<column id="asn.expectedQuantity" title="asn.expectedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="asn.receivedQuantity" title="asn.receivedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="asn.receivedDate" title="asn.receivedDate" visible="true" horizonAlign="left" dataType="date"/>
|
||||
<column id="asn.billType.code" title="maintainASNPage.asn.billType.code" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="dock.id" title="asn.dock" visible="false" horizonAlign="center" verticalAlign="middle"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editASNTPEPage"/>
|
||||
<popup id="modify" title="edit" enableType="single" invisible="false" containId="true" pageId="editASNTPEPage"/>
|
||||
<commit id="delete" title="delete" enableType="multi" invisible="false" confirmMessage="maintainASNPage.maintainReceivingDocPage.confirm.delete">
|
||||
<enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="deleteAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="cancel" title="cancel" enableType="multi" invisible="false" confirmMessage="maintainASNPage.maintainReceivingDocPage.confirm.cancel">
|
||||
<enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="cancelAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<!-- <popup id="willReceive" title="maintainASNPage.willReceive" enableType="multi" invisible="false" containId="true" pageId="editWillReceivePage"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<commit id="active" title="active" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${asn.status}=='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="activeAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="inactive" title="inactive" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${asn.status}=='ACTIVE')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="inactiveAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="oneKeyReceive" title="oneKeyReceive" enableType="multi" invisible="false" confirmMessage="确认是否一键收货?" >
|
||||
<enableExpression><![CDATA[(${asn.status}=='ACTIVE')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="oneKeyReceive" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="receiveConfirm" title="receive" enableType="single" invisible="false" containId="true" pageId="asnReceiveConfirmPage">
|
||||
<!-- <enableExpression><![CDATA[ (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
|
||||
</popup>
|
||||
<!-- <popup id="receiveConfirmImport" title="receiveConfirmImport" enableType="single" invisible="false" containId="true" pageId="editImportASNReceiveConfirmPage"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.billType.code} != 'PO_STRAIGHT') && (${asn.status}=='ACTIVE' || ${asn.status}=='RECEIVING' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<popup id="receiveBack" title="receiveBack" enableType="single" invisible="false" containId="true" pageId="asnAdjustReceivingDocPage">
|
||||
<enableExpression><![CDATA[(${asn.status}=='RECEIVING' || ${asn.status} =='RECEIVED' || ${asn.status} =='CLOSE')]]></enableExpression>
|
||||
</popup>
|
||||
<!-- <popup id="quality" title="quality" enableType="single" invisible="false" containId="true" pageId="editASNQualityPage"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.status}=='RECEIVING' || ${asn.status}=='RECEIVED')]]></enableExpression> -->
|
||||
<!-- </popup> -->
|
||||
<!-- <commit id="createMoveDoc" title="maintainReceivingDocPage.createMoveDoc" enableType="single" invisible="false" confirmMessage="maintainReceivingDocPage.createMoveDoc.confirm"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.status} =='RECEIVING' || ${asn.status} =='RECEIVED')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="createMoveDocByASN" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="receiveOver" title="maintainASNPage.receiveOver" enableType="multi" invisible="false"> -->
|
||||
<!-- <enableExpression><![CDATA[${asn.billType.code} != 'PO_TRANSFER' && (${asn.status} == 'RECEIVING' || ${asn.status}=='RECEIVED' || ${asn.status}=='PUTAWAY')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="receiveOver" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="virInOutput" title="maintainASNPage.virInOutput" enableType="multi" invisible="true" confirmMessage="maintainASNPage.virInOutput.confirmMessage"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.billType.code}=='PO_STRAIGHT' && ${asn.status}=='ACTIVE')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="virInOutputStock" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="ZZRK" title="ZZRK" enableType="multi" invisible="true"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.billType.code}=='PO_TRANSFER' && ${asn.status}=='ACTIVE')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="transitInStock" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<!-- <commit id="ZZCK" title="ZZCK" enableType="multi" invisible="true"> -->
|
||||
<!-- <enableExpression><![CDATA[(${asn.billType.code}=='PO_TRANSFER' && ${asn.status}=='RECEIVED')]]></enableExpression> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list"/> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="asnManager" methodName="transitOutStock" parameter="ids"/> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" editEnabled="true"/> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<popup id="viewReceivedRecord" title="maintainASNPage.viewReceivedRecord" enableType="single" invisible="false" containId="true" pageId="modifityReceivedRecordPage">
|
||||
<enableExpression><![CDATA[${asn.status} != 'OPEN' && ${asn.status} != 'ACTIVE' && ${asn.status} != 'CANCEL']]></enableExpression>
|
||||
</popup>
|
||||
<popup id="importTPEASN" title="线下导入" enableType="none" invisible="false" containId="true" pageId="importASNPage"/>
|
||||
<popup id="crkImport" title="出入库模板导入" enableType="none" invisible="false" containId="true" pageId="crkImportPage"/>
|
||||
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
WHERE 1=1
|
||||
and asn.beLine=0
|
||||
and asn.billType.name!='退货入库单'
|
||||
and company.id=19
|
||||
and company.id=5
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ editEmmaASNPage=Emma\u8BA2\u5355
|
|||
editSealyImport=\u51fa\u5165\u5e93\u6a21\u677f\u5bfc\u5165
|
||||
maintainSealyASNPage=\u4e1d\u6d9f
|
||||
editSealyASNPage=\u4e1d\u6d9f\u8ba2\u5355
|
||||
maintainZhizhuASNPage=\u6155\u601D
|
||||
maintainZhizhuASNPage=\u667a\u7b51
|
||||
editZhizhuASNPage=\u667a\u7b51\u8ba2\u5355
|
||||
maintainXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546
|
||||
editXLMJXSASNPage=\u559c\u4e34\u95e8\u7ecf\u9500\u5546\u8ba2\u5355
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="sertaImportASNPage" title="crkImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="asnManager" methodName="sertaImport" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="editSealyPtImport" title="editSealyPtImport" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="sealyPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="emmaPtImportPage" title="emmaPtImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="emmaPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="importPickTicketTPCusPage" title="importPickTicketTPCusPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="sbw"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="importPickTicketTPCus" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="importPickTicketTPPage" title="importPickTicketTPPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="sbw"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="importPickTicketTP" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="issuereceiptImport2Page" title="issuereceiptImport2Page" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线上" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="1" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="issuereceiptImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="issuereceiptImportPage" title="issuereceiptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="issuereceiptImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -66,7 +66,8 @@
|
|||
left join pickTicket.company company
|
||||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and company.id in (7,40,41)
|
||||
and company.id=7
|
||||
and company.beCompany=true
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,226 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainPickTicketTP2Page" title="maintainPickTicketTP2Page" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[select company.id, company.name from Structure company
|
||||
where company.beCompany = true
|
||||
and company.disabled=false
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
]]></hql>
|
||||
</list>
|
||||
|
||||
<list id="status" title="status" row="1" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="PickTicketStatus">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'PickTicketStatus']]></hql>
|
||||
</list>
|
||||
<text id="code" title="pickTicket.code" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<text id="relatedBill1" title="客户订单号" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<dateRanger id="pickTicket.orderDate" title="pickTicket.orderDate" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="false" fromDate="pickTicket.orderDate.begin" toDate="pickTicket.orderDate.end"/>
|
||||
<dateRanger id="pickTicket.shipDate" title="pickTicket.shipDate" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="pickTicket.shipDate.begin" toDate="pickTicket.shipDate.end"/>
|
||||
<text id="shipToName" title="收货人姓名" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
<text id="pickTicket.shipToContact.telephone" title="联系方式" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
<text id="pickTicket.shipToAddress.address" title="详细地址" row="6" col="1" span="2" width="320" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
|
||||
<list id="pickTicket.billType.id" title="0013D4FC457C1188956282812" row="7" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[SELECT
|
||||
billType.id,
|
||||
billType.name
|
||||
FROM BillType billType
|
||||
WHERE 1=1
|
||||
AND billType.disabled = false
|
||||
AND billType.type in ('SHIP')
|
||||
]]></hql>
|
||||
</list>
|
||||
|
||||
<checkbox id="ordersAll" title="是否显示全部" row="8" col="1" defaultValue="false"
|
||||
span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||
|
||||
</inputUIs>
|
||||
</search>
|
||||
<datasource type="hql"><![CDATA[ select pickTicket.id,
|
||||
company.name,
|
||||
pickTicket.code,
|
||||
pickTicket.billType.name,
|
||||
pickTicket.relatedBill1,
|
||||
pickTicket.relatedBill3,
|
||||
DATE_FORMAT(pickTicket.intendShipDate,'%Y-%m-%d'),
|
||||
pickTicket.status,
|
||||
CAST(pickTicket.orderQuantity as integer),
|
||||
CAST(pickTicket.preAllocatedQuantity as integer),
|
||||
CAST(pickTicket.allocatedQuantity as integer),
|
||||
CAST(pickTicket.pickedQuantity as integer),
|
||||
CAST(pickTicket.shippedQuantity as integer),
|
||||
pickTicket.shipToName,
|
||||
pickTicket.shipToContact.telephone,
|
||||
pickTicket.shipToAddress.address,
|
||||
dock.code,
|
||||
pickTicket.shipDate
|
||||
from PickTicket pickTicket
|
||||
left join pickTicket.company company
|
||||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and pickTicket.beLine=1
|
||||
and company.beCompany=true
|
||||
and company.id=1
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
/~SESSION_WAREHOUSE: and pickTicket.warehouse = #{SESSION_WAREHOUSE} ~/
|
||||
/~pickTicket.billType.id: AND pickTicket.billType.id = {pickTicket.billType.id} ~/
|
||||
/~company.id: AND pickTicket.company.id = {company.id} ~/
|
||||
/~code: AND pickTicket.code LIKE {code} ~/
|
||||
/~shipToName: AND pickTicket.shipToName LIKE {shipToName} ~/
|
||||
/~pickTicket.shipToContact.telephone: AND upper(pickTicket.shipToContact.telephone) like upper({pickTicket.shipToContact.telephone}) ~/
|
||||
/~pickTicket.shipToAddress.address: AND upper(pickTicket.shipToAddress.address) like upper({pickTicket.shipToAddress.address}) ~/
|
||||
/~relatedBill1: AND upper(pickTicket.relatedBill1) like upper({relatedBill1}) ~/
|
||||
/~status: AND pickTicket.status = {status} ~/
|
||||
/~pickTicket.orderDate.begin: AND pickTicket.orderDate >= {pickTicket.orderDate.begin} ~/
|
||||
/~pickTicket.orderDate.end: AND pickTicket.orderDate <= {pickTicket.orderDate.end} ~/
|
||||
/~pickTicket.shipDate.begin: AND pickTicket.shipDate >= {pickTicket.shipDate.begin} ~/
|
||||
/~pickTicket.shipDate.end: AND pickTicket.shipDate <= {pickTicket.shipDate.end} ~/
|
||||
/~userName: AND pickTicket.userName LIKE {userName} ~/
|
||||
/~pickTicket.waveCode: and pickTicket.waveCode like {pickTicket.waveCode} ~/
|
||||
/~pickTicket.carrier.id: AND carrier.id = {pickTicket.carrier.id} ~/
|
||||
/~pickTicket.dock.id: AND dock.id = {pickTicket.dock.id} ~/
|
||||
order by pickTicket.id desc]]></datasource>
|
||||
<columns>
|
||||
<column id="pickTicket.id" title="pickTicket" visible="false"/>
|
||||
<column id="pickTicket.company.name" title="pickTicket.company" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.code" title="pickTicket.code" visible="true" horizonAlign="left" />
|
||||
<column id="pickTicket.billType.name" title="billType" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="pickTicket.relatedBill1" title="客户订单号" width="150" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.relatedBill3" title="门店名称" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.intendShipDate" width="100" title="约定发货日期" visible="true" horizonAlign="left" dataType="date"/>
|
||||
<column id="pickTicket.status" width="60" title="pickTicket.status" visible="true" horizonAlign="left" dataType="enum" format="enumFormat" formatParam="PickTicketStatus"/>
|
||||
<column id="pickTicket.orderQuantity" width="60" title="pickTicket.orderQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.preAllocatedQuantity" width="100" title="pickTicket.preAllocatedQuantity" visible="false" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.allocatedQuantity" width="60" title="pickTicket.allocatedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.pickedQuantity" width="60" title="pickTicket.pickedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.shippedQuantity" width="60" title="pickTicket.shippedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.shipToName" title="收货人姓名" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.shipToContact.telephone" title="联系方式" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.shipToAddress.address" title="详细地址" visible="true" horizonAlign="left"/>
|
||||
<column id="dock.code" title="maintainPickTicketPage.pickTicket.shipLocation.id" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="pickTicket.shipDate" width="100" title="pickTicket.shipDate" visible="true" horizonAlign="left" dataType="date"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editPickTicketPage2"/>
|
||||
<popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editPickTicketPage2"/>
|
||||
<commit id="delete" title="delete" enableType="multi" invisible="false" confirmMessage="title1168842884125">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="deleteAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="cancel" title="cancel" enableType="multi" invisible="false" confirmMessage="title1168843214687">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="cancelAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="active" title="active" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='OPEN' && ${dock.id}!='-')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="activeAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="inactive" title="inactive" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='ACTIVE') || (${pickTicket.status} =='PREALLOCATE') ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inactiveAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="allocate" title="maintainPickTicketPage.allocate" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ACTIVE') || (${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PREALLOCATE') || (${pickTicket.status} =='SHIP_PART')) ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="allocateManager" methodName="pickAllocate" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="manualAllocate" title="manualAllocate" enableType="single" invisible="false" containId="true" pageId="modifityAllocatePage">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='PREALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='ACTIVE') || (${pickTicket.status} =='SHIP_PART') || (${pickTicket.status} =='ALLOCATE'))]]></enableExpression>
|
||||
</popup>
|
||||
<commit id="unallocate" title="maintainPickTicketPage.unallocate" enableType="multi" invisible="false" confirmMessage="maintainPickTicketPage.unallocate.confirmMessage">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ALLOCATE') ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="unallocate" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="pickConfirm" title="pickConfirm" enableType="single" invisible="false" containId="true" pageId="editPickConfirmPage">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='SHIP_PART')) && ((${pickTicket.allocatedQuantity}-${pickTicket.pickedQuantity})>0) ]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="pickBatch" title="pickBatch" enableType="multi" invisible="false" containId="true" pageId="setBatchPickTicketPage">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='SHIP_PART')) && ((${pickTicket.allocatedQuantity}-${pickTicket.pickedQuantity})>0) ]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="pickedBack" title="pickedBack" enableType="single" invisible="false" containId="true" pageId="pickBackPage">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='PICKUP' || ${pickTicket.status} =='PICK_ALL') && (${pickTicket.BOLQuantity} == 0)]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="shipConfirm" title="shipConfirm" enableType="multi" invisible="false" containId="true" pageId="editShippingConfirmPage">
|
||||
<enableExpression><![CDATA[( ${pickTicket.status} =='PICKUP'|| ${pickTicket.status} =='PICK_ALL' || ${pickTicket.status} =='SHIP_PART') ]]></enableExpression>
|
||||
</popup>
|
||||
<commit id="close" title="close" enableType="multi" invisible="false" confirmMessage="确认是否关闭订单?">
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="closeAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="reportPickedRecordPopup" title="0013D4FC457C1190964575984" enableType="multi" invisible="false" containId="true" pageId="pickTPRreportPage">
|
||||
<!-- <enableExpression><![CDATA[(${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PICKUP')]]></enableExpression> -->
|
||||
</popup>
|
||||
<popup id="viewTaskLog" title="maintainPickTicketPage.viewTaskLog" enableType="single" invisible="false" containId="true" pageId="modifityTaskLogPage">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} !='OPEN' && ${pickTicket.status} !='ACTIVE' && ${pickTicket.status} !='PREALLOCATE' && ${pickTicket.status} !='CANCEL' )]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="importPickTicket2" title="importPickTicket2" enableType="none" invisible="false" containId="true" pageId="importPickTicketTPPage2"/>
|
||||
<popup id="issuereceiptImport" title="issuereceiptImport" enableType="none" invisible="false" containId="true" pageId="issuereceiptImport2Page"/>
|
||||
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,231 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainPickTicketTPPage" title="maintainPickTicketTPPage" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[select company.id, company.name from Structure company
|
||||
where company.beCompany = true
|
||||
and company.disabled=false
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
]]></hql>
|
||||
</list>
|
||||
|
||||
<list id="status" title="status" row="1" col="2" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="PickTicketStatus">
|
||||
<hql><![CDATA[ SELECT
|
||||
enumerate.enumValue,
|
||||
enumerate.enumValue From Enumerate enumerate
|
||||
where enumerate.enumType = 'PickTicketStatus']]></hql>
|
||||
</list>
|
||||
<text id="code" title="pickTicket.code" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<text id="relatedBill1" title="客户订单号" row="2" col="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" trimSpace="false"/>
|
||||
<dateRanger id="pickTicket.orderDate" title="pickTicket.orderDate" row="3" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="true" manualEditable="true" defaultCurrentDate="false" fromDate="pickTicket.orderDate.begin" toDate="pickTicket.orderDate.end"/>
|
||||
<dateRanger id="pickTicket.shipDate" title="pickTicket.shipDate" row="4" col="1" span="2" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="false" showTime="false" manualEditable="true" defaultCurrentDate="false" fromDate="pickTicket.shipDate.begin" toDate="pickTicket.shipDate.end"/>
|
||||
<text id="shipToName" title="收货人姓名" row="5" col="1" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
<text id="pickTicket.shipToContact.telephone" title="联系方式" row="5" col="2" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
<text id="pickTicket.shipToAddress.address" title="详细地址" row="6" col="1" span="2" width="320" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" trimSpace="false"/>
|
||||
|
||||
<list id="pickTicket.billType.id" title="0013D4FC457C1188956282812" row="7" col="1" span="1" width="120" readOnly="false" required="false" reserve="false" forceOverride="true">
|
||||
<hql><![CDATA[SELECT
|
||||
billType.id,
|
||||
billType.name
|
||||
FROM BillType billType
|
||||
WHERE 1=1
|
||||
AND billType.disabled = false
|
||||
AND billType.type in ('SHIP')
|
||||
]]></hql>
|
||||
</list>
|
||||
|
||||
<checkbox id="ordersAll" title="是否显示全部" row="8" col="1" defaultValue="false"
|
||||
span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||
|
||||
</inputUIs>
|
||||
</search>
|
||||
<datasource type="hql"><![CDATA[ select pickTicket.id,
|
||||
company.name,
|
||||
pickTicket.code,
|
||||
pickTicket.billType.name,
|
||||
pickTicket.relatedBill1,
|
||||
pickTicket.relatedBill3,
|
||||
DATE_FORMAT(pickTicket.intendShipDate,'%Y-%m-%d'),
|
||||
pickTicket.status,
|
||||
CAST(pickTicket.orderQuantity as integer),
|
||||
CAST(pickTicket.preAllocatedQuantity as integer),
|
||||
CAST(pickTicket.allocatedQuantity as integer),
|
||||
CAST(pickTicket.pickedQuantity as integer),
|
||||
CAST(pickTicket.shippedQuantity as integer),
|
||||
pickTicket.shipToName,
|
||||
pickTicket.shipToContact.telephone,
|
||||
pickTicket.shipToAddress.address,
|
||||
CAST(round(pickTicket.packageQuantity,2) as string),
|
||||
dock.code,
|
||||
pickTicket.shipDate
|
||||
from PickTicket pickTicket
|
||||
left join pickTicket.company company
|
||||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and pickTicket.beLine=0
|
||||
and company.beCompany=true
|
||||
and company.id=1
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
or 0=(select COALESCE(max(u.id),0) from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
)
|
||||
/~SESSION_WAREHOUSE: and pickTicket.warehouse = #{SESSION_WAREHOUSE} ~/
|
||||
/~pickTicket.billType.id: AND pickTicket.billType.id = {pickTicket.billType.id} ~/
|
||||
/~company.id: AND pickTicket.company.id = {company.id} ~/
|
||||
/~code: AND pickTicket.code LIKE {code} ~/
|
||||
/~shipToName: AND pickTicket.shipToName LIKE {shipToName} ~/
|
||||
/~pickTicket.shipToContact.telephone: AND upper(pickTicket.shipToContact.telephone) like upper({pickTicket.shipToContact.telephone}) ~/
|
||||
/~pickTicket.shipToAddress.address: AND upper(pickTicket.shipToAddress.address) like upper({pickTicket.shipToAddress.address}) ~/
|
||||
/~relatedBill1: AND upper(pickTicket.relatedBill1) like upper({relatedBill1}) ~/
|
||||
/~status: AND pickTicket.status = {status} ~/
|
||||
/~pickTicket.orderDate.begin: AND pickTicket.orderDate >= {pickTicket.orderDate.begin} ~/
|
||||
/~pickTicket.orderDate.end: AND pickTicket.orderDate <= {pickTicket.orderDate.end} ~/
|
||||
/~pickTicket.shipDate.begin: AND pickTicket.shipDate >= {pickTicket.shipDate.begin} ~/
|
||||
/~pickTicket.shipDate.end: AND pickTicket.shipDate <= {pickTicket.shipDate.end} ~/
|
||||
/~userName: AND pickTicket.userName LIKE {userName} ~/
|
||||
/~pickTicket.waveCode: and pickTicket.waveCode like {pickTicket.waveCode} ~/
|
||||
/~pickTicket.carrier.id: AND carrier.id = {pickTicket.carrier.id} ~/
|
||||
/~pickTicket.dock.id: AND dock.id = {pickTicket.dock.id} ~/
|
||||
order by pickTicket.id desc]]></datasource>
|
||||
<columns>
|
||||
<column id="pickTicket.id" title="pickTicket" visible="false"/>
|
||||
<column id="pickTicket.company.name" title="pickTicket.company" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.code" title="pickTicket.code" visible="true" horizonAlign="left" />
|
||||
<column id="pickTicket.billType.name" title="billType" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="pickTicket.relatedBill1" title="客户订单号" width="150" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.relatedBill3" title="门店名称" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.intendShipDate" width="100" title="约定发货日期" visible="true" horizonAlign="left" dataType="date"/>
|
||||
<column id="pickTicket.status" width="60" title="pickTicket.status" visible="true" horizonAlign="left" dataType="enum" format="enumFormat" formatParam="PickTicketStatus"/>
|
||||
<column id="pickTicket.orderQuantity" width="60" title="pickTicket.orderQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.preAllocatedQuantity" width="100" title="pickTicket.preAllocatedQuantity" visible="false" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.allocatedQuantity" width="60" title="pickTicket.allocatedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.pickedQuantity" width="60" title="pickTicket.pickedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.shippedQuantity" width="60" title="pickTicket.shippedQuantity" visible="true" horizonAlign="right" dataType="double" />
|
||||
<column id="pickTicket.shipToName" title="收货人姓名" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.shipToContact.telephone" title="联系方式" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.shipToAddress.address" title="详细地址" visible="true" horizonAlign="left"/>
|
||||
<column id="pickTicket.packageQuantity" title="订单总体积" visible="true" horizonAlign="left"/>
|
||||
<column id="dock.code" title="maintainPickTicketPage.pickTicket.shipLocation.id" visible="true" horizonAlign="center" verticalAlign="middle"/>
|
||||
<column id="pickTicket.shipDate" width="100" title="pickTicket.shipDate" visible="true" horizonAlign="left" dataType="date"/>
|
||||
</columns>
|
||||
<buttons>
|
||||
<popup id="new" title="new" enableType="none" invisible="false" containId="false" pageId="editPickTicketPage"/>
|
||||
<popup id="modify" title="modify" enableType="single" invisible="false" containId="true" pageId="editPickTicketPage"/>
|
||||
<commit id="delete" title="delete" enableType="multi" invisible="false" confirmMessage="title1168842884125">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="deleteAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="cancel" title="cancel" enableType="multi" invisible="false" confirmMessage="title1168843214687">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='OPEN')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="cancelAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="active" title="active" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='OPEN' && ${dock.id}!='-')]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="activeAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="inactive" title="inactive" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='ACTIVE') || (${pickTicket.status} =='PREALLOCATE') ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="inactiveAll" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="false" editEnabled="false"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<commit id="allocate" title="maintainPickTicketPage.allocate" enableType="multi" invisible="false">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ACTIVE') || (${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PREALLOCATE') || (${pickTicket.status} =='SHIP_PART')) ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="allocateManager" methodName="pickAllocate" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="manualAllocate" title="manualAllocate" enableType="single" invisible="false" containId="true" pageId="modifityAllocatePage">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='PREALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='ACTIVE') || (${pickTicket.status} =='SHIP_PART') || (${pickTicket.status} =='ALLOCATE'))]]></enableExpression>
|
||||
</popup>
|
||||
<commit id="unallocate" title="maintainPickTicketPage.unallocate" enableType="multi" invisible="false" confirmMessage="maintainPickTicketPage.unallocate.confirmMessage">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ALLOCATE') ]]></enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="unallocate" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="pickConfirm" title="pickConfirm" enableType="single" invisible="false" containId="true" pageId="editPickConfirmPage">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='SHIP_PART')) && ((${pickTicket.allocatedQuantity}-${pickTicket.pickedQuantity})>0) ]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="pickBatch" title="pickBatch" enableType="multi" invisible="false" containId="true" pageId="setBatchPickTicketPage">
|
||||
<enableExpression><![CDATA[((${pickTicket.status} =='PARTALLOCATE')||(${pickTicket.status} =='ALLOCATE') || (${pickTicket.status} =='PICKUP') || (${pickTicket.status} =='SHIP_PART')) && ((${pickTicket.allocatedQuantity}-${pickTicket.pickedQuantity})>0) ]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="pickedBack" title="pickedBack" enableType="single" invisible="false" containId="true" pageId="pickBackPage">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} =='PICKUP' || ${pickTicket.status} =='PICK_ALL') && (${pickTicket.BOLQuantity} == 0)]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="shipConfirm" title="shipConfirm" enableType="multi" invisible="false" containId="true" pageId="editShippingConfirmPage">
|
||||
<enableExpression><![CDATA[( ${pickTicket.status} =='PICKUP'|| ${pickTicket.status} =='PICK_ALL' || ${pickTicket.status} =='SHIP_PART') ]]></enableExpression>
|
||||
</popup>
|
||||
<commit id="createOrder" title="生成运输订单" enableType="multi" invisible="false" confirmMessage="确认是否生成运输订单？">
|
||||
<mappings>
|
||||
<mapping id="ids" className="list"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="createOrder" parameter="ids"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true" editEnabled="true"/>
|
||||
</forwards>
|
||||
</commit>
|
||||
<popup id="reportPickedRecordPopup" title="0013D4FC457C1190964575984" enableType="multi" invisible="false" containId="true" pageId="pickTPRreportPage">
|
||||
|
||||
</popup>
|
||||
<popup id="viewTaskLog" title="maintainPickTicketPage.viewTaskLog" enableType="single" invisible="false" containId="true" pageId="modifityTaskLogPage">
|
||||
<enableExpression><![CDATA[(${pickTicket.status} !='OPEN' && ${pickTicket.status} !='ACTIVE' && ${pickTicket.status} !='PREALLOCATE' && ${pickTicket.status} !='CANCEL' )]]></enableExpression>
|
||||
</popup>
|
||||
<popup id="importPickTicket" title="importPickTicket" enableType="none" invisible="false" containId="true" pageId="importPickTicketTPPage"/>
|
||||
<popup id="importPickTicketTPCus" title="客户订单导入" enableType="none" invisible="false" containId="true" pageId="importPickTicketTPCusPage"/>
|
||||
|
||||
<popup id="issuereceiptImport" title="issuereceiptImport" enableType="none" invisible="false" containId="true" pageId="issuereceiptImportPage"/>
|
||||
|
||||
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<maintainPage id="maintainZhizhuPickTicketPage" title="慕思" autoQuery="false">
|
||||
<maintainPage id="maintainZhizhuPickTicketPage" title="智筑建材" autoQuery="false">
|
||||
<search>
|
||||
<inputUIs>
|
||||
<list id="company.id" title="asn.company" row="1" col="1" span="1" width="120" defaultValue="" readOnly="false" required="false" reserve="false" forceOverride="true">
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
left join pickTicket.company company
|
||||
left join pickTicket.dock dock
|
||||
where 1=1
|
||||
and company.id=19
|
||||
and company.id=5
|
||||
and company.beCompany=true
|
||||
and ( pickTicket.status not in('CLOSE') or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
and (company.id in (select u.organization.id from UserOrganize u where u.user=#{SESSION_USERS})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="sertaImportPage" title="sertaImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="sertaImport" parameter="imageFile"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="xinKanImportPage" title="xinKanImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="emmaPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<pages>
|
||||
<editPage id="zhiZhuptImportPage" title="zhiZhuptImportPage" entityClass="com.dev.swms.server.model.receiving.ASN" width="270" height="130" onClose="refreshParent">
|
||||
<inputUIs>
|
||||
<hidden id="asn.id" reserve="false"/>
|
||||
<file id="imageFile" title="importFile" row="1" col="2" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false" showImage="false" storeDir="IMAGE_FILE_DIR" />
|
||||
<text id="type" title="线下" row="2" col="1" readOnly="false" required="false" reserve="false" forceOverride="false" inVisible="true" trimSpace="false" defaultValue="0" />
|
||||
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="importDJ" title="导入" enableType="single" invisible="false">
|
||||
<mappings>
|
||||
<mapping id="imageFile" className="file"/>
|
||||
<mapping id="type" className="string"/>
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="zhiZhuPtImport" parameter="imageFile,type"/>
|
||||
</actions>
|
||||
<forwards>
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</editPage>
|
||||
</pages>
|
||||
Loading…
Reference in New Issue