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

no message

sdInAndOutDetailRepotr
HUOJIN\92525 2024-12-02 18:15:32 +08:00
parent 008534f14f
commit a25d714cdc
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,11 +330,14 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
bzh=info[1];
temp=true;
}else{
cpdm=info[1];
cpdm=cpdm.replaceAll("([\u4E00-\u9FA5]+)|([\u4E00-\u9FA5])","");
System.out.println(cpdm);
line=Integer.parseInt(info[0]);
System.out.println(line);
if(info.length>1){
cpdm=info[1];
cpdm=cpdm.replaceAll("([\u4E00-\u9FA5]+)|([\u4E00-\u9FA5])","");
System.out.println(cpdm);
line=Integer.parseInt(info[0]);
System.out.println(line);
}
for(int x=2;x<info.length;x++){
String s=info[x];
if(s.equals("**")){

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

@ -400,7 +400,10 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements
public void removePickTicketDetail(Long pickTicketId,
List<Long> pickTicketDetailIds) {
PickTicket pickTicket = commonDao.load(PickTicket.class, pickTicketId);
pickTicket.removeDetails(pickTicketDetailIds);
for(Long pickTicketDetailId:pickTicketDetailIds){
PickTicketDetail ptd=this.load(PickTicketDetail.class, pickTicketDetailId);
commonDao.delete(ptd);
}
Refresh(pickTicketId);
shuaStatus(pickTicket);
}