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

no message

sdInAndOutDetailRepotr
HUOJIN\92525 2025-03-31 10:22:32 +08:00
parent bcc158cb60
commit 086d6304c0
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/dev/swms/server/service/base/pojo/DefaultImportFileManager.java
View File

@ -331,6 +331,11 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
} }
if(info[0].indexOf("收货方")>=0){
continue;
}
if(info[0].indexOf("备注")>=0){ if(info[0].indexOf("备注")>=0){
bzh=info[1]; bzh=info[1];

2
src/main/java/com/dev/swms/server/service/shipping/pojo/DefaultPickTicketManager.java
View File

@ -4117,7 +4117,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
HashMap<String,String> code_map=new HashMap<String, String>(); HashMap<String,String> code_map=new HashMap<String, String>();
HashMap<String,String> code_map_old=new HashMap<String, String>(); HashMap<String,String> code_map_old=new HashMap<String, String>();
for (int i = 1; i <sheet.getRows(); i++) { for (int i = 1; i <sheet.getRows(); i++) {
String kh=sheet.getCell(0,i).getContents().trim();// 单据编号 String kh=sheet.getCell(0,i).getContents().trim();//
String relatedBill1=sheet.getCell(1,i).getContents().trim();// 单据编号 String relatedBill1=sheet.getCell(1,i).getContents().trim();// 单据编号
String code=sheet.getCell(2,i).getContents().trim();//代码 String code=sheet.getCell(2,i).getContents().trim();//代码
String billtype=sheet.getCell(10,i).getContents().trim();// 单据类型 String billtype=sheet.getCell(10,i).getContents().trim();// 单据类型

1
src/webapp/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
View File

@ -231,6 +231,7 @@
<popup id="viewTaskLog" title="maintainPickTicketPage.viewTaskLog" enableType="single" invisible="false" containId="true" pageId="modifityTaskLogPage"> <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> <enableExpression><![CDATA[(${pickTicket.status} !='OPEN' && ${pickTicket.status} !='ACTIVE' && ${pickTicket.status} !='PREALLOCATE' && ${pickTicket.status} !='CANCEL' )]]></enableExpression>
</popup> </popup>
<popup id="xinKanImport" title="出入库模板导入" enableType="none" invisible="false" containId="true" pageId="xinKanImportPage"/>
</buttons> </buttons>
</maintainPage> </maintainPage>

1
target/hrbwms/WEB-INF/classes/config/origen/shipping/maintainHBNZHSPickTicketPage.xml
View File

@ -231,6 +231,7 @@
<popup id="viewTaskLog" title="maintainPickTicketPage.viewTaskLog" enableType="single" invisible="false" containId="true" pageId="modifityTaskLogPage"> <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> <enableExpression><![CDATA[(${pickTicket.status} !='OPEN' && ${pickTicket.status} !='ACTIVE' && ${pickTicket.status} !='PREALLOCATE' && ${pickTicket.status} !='CANCEL' )]]></enableExpression>
</popup> </popup>
<popup id="xinKanImport" title="出入库模板导入" enableType="none" invisible="false" containId="true" pageId="xinKanImportPage"/>
</buttons> </buttons>
</maintainPage> </maintainPage>