|
@@ -2034,7 +2034,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
if(account.equals("102")){
|
|
|
jsonObject1.put("IVTID","131606");//模板号
|
|
|
}
|
|
|
- jsonObject1.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码
|
|
|
+ if (orderData.containsKey("cPayCode")){
|
|
|
+ jsonObject1.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码
|
|
|
+ }
|
|
|
jsonObject1.put("IEXCHRATE",orderData.get("nflat"));//汇率
|
|
|
jsonObject1.put("CEXCH_NAME",orderData.get("cexchname"));//币种名称
|
|
|
|
|
@@ -2107,6 +2109,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
List<SyPackingListTailoring> listTailoringList=codeMaps.get(code1);
|
|
|
//List<String> ids=new ArrayList<>();
|
|
|
for (SyPackingListTailoring tailoring : listTailoringList){
|
|
|
+ tailoring.setRdrecord32Code(null);
|
|
|
//ids.add(fabric.getId());
|
|
|
if (codeMaps2.get(code1).indexOf("失败")>-1){
|
|
|
if(tailoring.getSaleInvoiceError()==null){
|
|
@@ -2279,6 +2282,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
|
|
|
continue;
|
|
|
}
|
|
|
for (SyPackingListTailoring tailoring : listTailoringList){
|
|
|
+ tailoring.setRdrecord32Code(null);
|
|
|
if (codeMaps2.get(code1).indexOf("失败")>-1){
|
|
|
if(tailoring.getSaleInvoiceError()==null){
|
|
|
tailoring.setSaleInvoiceError(codeMaps2.get(code1));
|