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-06-26 13:36:51 +08:00
parent 1f0638a182
commit a96cd4e482
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -635,6 +635,7 @@ public class EmisWaybillController extends EmisBaseController
return AjaxResult.error("获取失败"); return AjaxResult.error("获取失败");
} }
@Log(title = "APP获取面单信息", businessType = BusinessType.OTHER)
@GetMapping("/realGetPrintList") @GetMapping("/realGetPrintList")
public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType) public AjaxResult realGetPrintList(String billCode, String billCodeRange,String tplCode, String lang, String printType)
{ {
@ -653,19 +654,44 @@ public class EmisWaybillController extends EmisBaseController
if(!StringUtils.isEmpty(billCode)){ if(!StringUtils.isEmpty(billCode)){
try { try {
JSONArray jArr = new JSONArray(); JSONArray jArr = new JSONArray();
String printManCode=getLoginUser().getUser().getEmpCode(); String printManCode=getLoginUser().getUser().getEmpCode();
// 先检查运单是否存在 // 确定是否打子单
String tplCodeStr=WaybillHelper.formatQueryValue(printType);
String billCodeArr[]=tplCodeStr.split(",");
if(billCodeArr.length>0){
JSONArray fileArrAll = new JSONArray();
String tplCodeStr=WaybillHelper.formatQueryValue(printType);
String tplCodeArr[]=tplCodeStr.split(",");
if(tplCodeArr.length>0){
for (String tpCodeItem:tplCodeArr) {
if("TAN-GC-130".equals(tpCodeItem)) {
// 循环获取主单信息
String billSubCodeAllStr="";
String[] billCodeArr = billCode.split(",");
if(billCodeArr.length>0){
for (String billCodeItem:billCodeArr) {
EmisWaybill emisWaybill= emisBaseService.getWaybillByBillCode(billCodeItem);
billSubCodeAllStr=billSubCodeAllStr+emisWaybill.getBillCodeSub()+",";
}
} }
String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode); String strArry = PrintUtils.getPdfByBillCode(billSubCodeAllStr, tpCodeItem, printManCode);
JSONArray fileArr = JSONArray.parseArray(strArry); JSONArray fileArr = JSONArray.parseArray(strArry);
for(Object objFile:fileArr) { fileArrAll.addAll(fileArr);
}else{
// 直接获取
String strArry = PrintUtils.getPdfByBillCode(billCode, tpCodeItem, printManCode);
JSONArray fileArr = JSONArray.parseArray(strArry);
fileArrAll.addAll(fileArr);
}
}
}
// String strArry=PrintUtils.getPdfByBillCode(billCode,tplCodeStr,printManCode);
// JSONArray fileArr = JSONArray.parseArray(strArry);
for(Object objFile:fileArrAll) {
JSONObject jObjFileItem = (JSONObject) objFile; JSONObject jObjFileItem = (JSONObject) objFile;
String result = jObjFileItem.getString("result"); String result = jObjFileItem.getString("result");
String billCodeItem = jObjFileItem.getString("billCodeItem"); String billCodeItem = jObjFileItem.getString("billCodeItem");

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -1291,7 +1291,6 @@ public class EmisBaseService {
extData.put("k8",sendSite.getSiteNameEn()); extData.put("k8",sendSite.getSiteNameEn());
extData.put("k10",waybill.getSendSiteName()); extData.put("k10",waybill.getSendSiteName());
EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode()); EmisSite destSite = getSiteByCode(waybill.getDispatchUnderlingSiteCode());
extData.put("k9",destSite.getSiteNameEn()); extData.put("k9",destSite.getSiteNameEn());
extData.put("k11",destSite.getSiteName()); extData.put("k11",destSite.getSiteName());