aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-12-11 17:21:49 +08:00
parent cc41bffc34
commit dd930cb3b5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -1448,7 +1448,6 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
emisWaybillSave.setDataFrom(WaybillHelper.getDataFrom()); emisWaybillSave.setDataFrom(WaybillHelper.getDataFrom());
} }
if(StringUtils.isEmpty(emisWaybillSave.getPackType())){ if(StringUtils.isEmpty(emisWaybillSave.getPackType())){
emisWaybillSave.setPackType("2"); emisWaybillSave.setPackType("2");
} }
@ -1529,6 +1528,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
sendAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode()); sendAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
sendAddress.setAddressType("1"); sendAddress.setAddressType("1");
sendAddress.setCustomerCode(customerCode);
// 收件地址 // 收件地址
EmisCustomerAddress recieveAddress = new EmisCustomerAddress(); EmisCustomerAddress recieveAddress = new EmisCustomerAddress();
@ -1544,6 +1544,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
recieveAddress.setCompany(emisWaybillSave.getReceiveCompany()); recieveAddress.setCompany(emisWaybillSave.getReceiveCompany());
recieveAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode()); recieveAddress.setUseSiteCode(emisWaybillSave.getSendSiteCode());
recieveAddress.setAddressType("2"); recieveAddress.setAddressType("2");
recieveAddress.setCustomerCode(customerCode);
// 获取客户简码 // 获取客户简码
@ -1600,7 +1601,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
try { try {
// TAN-SMD-240603-01 // TAN-SMD-240603-01
String YYMMDD = "yyMMdd"; String YYMMDD = "yyMMdd";
String hbKey = "TAN" + "-" + simpleName +"-"+ DateUtils.parseDateToStr(YYMMDD, new Date()); // String hbKey = "TAN" + "-" + simpleName +"-"+ DateUtils.parseDateToStr(YYMMDD, new Date());
String hbKey = "TAN" + "-" + simpleName +"-"+ DateUtils.parseDateToStr(YYMMDD, emisWaybillSave.getPickStartDate());
Long lockNo = redissonService.addAndGetLong(hbKey, 1L); Long lockNo = redissonService.addAndGetLong(hbKey, 1L);
String wayhoustInNo = hbKey + "" + StringUtils.leftPad(String.valueOf(lockNo), 2, "0"); String wayhoustInNo = hbKey + "" + StringUtils.leftPad(String.valueOf(lockNo), 2, "0");
emisWaybillSave.setIntoWarehouseBillCode(wayhoustInNo); emisWaybillSave.setIntoWarehouseBillCode(wayhoustInNo);

2
emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
View File

@ -146,7 +146,7 @@
AND exists ( AND exists (
select 1 from emis_settle_sub_bill b select 1 from emis_settle_sub_bill b
where x2.settle_bill_no=b.settle_bill_no where x2.settle_bill_no=b.settle_bill_no
and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') ) and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) )
) )
) )