diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 2671eadc8..71d1c8cdd 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -1846,6 +1846,11 @@ public class EmisBaseService { order.put("sendPerson", WaybillHelper.removeUnSeeChar(waybill.getSendName())); order.put("sendDate",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,waybill.getSendDate())); + order.put("receiveProvinceName", WaybillHelper.removeUnSeeChar(waybill.getReceiveProvinceName())); + order.put("receiveCityName", WaybillHelper.removeUnSeeChar(waybill.getReceiveCityName())); + order.put("receiveCountyName", WaybillHelper.removeUnSeeChar(waybill.getReceiveCountyName())); + + // receiveProvinceName receiveCityName receiveCountyName // k1 - 收件国(中文) // k2 - 线路名称(中文) // k3 - 产品类型(中文) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java index 916128106..354e44731 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceChRecordServiceImpl.java @@ -135,6 +135,8 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC // order.setDeliverPhone("123213"); order.setDeliverEmail(old.getEmail()); order.setWithTaxFlag( "1"); + order.setShowBankAccountType("3"); + // 蓝票 order.setInvoiceType("1"); @@ -165,6 +167,7 @@ public class EmisSettleInvoiceChRecordServiceImpl implements IEmisSettleInvoiceC order.setSalerAddress(old.getSalerCompanyAddress()); order.setSalerBank(old.getSalerBankName()); order.setSalerBankAccount(old.getSalerBankAccNo()); + order.setOrderRemark(old.getRemark()); JSONArray jArrGoods = JSONArray.parseArray(old.getExtData()); List goodsList = new ArrayList<>(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 5bb8376c5..b57d4aca6 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -1332,15 +1332,15 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm */ public List doUnPackScan(List itemList,String[] billCodeArr,Map scanDataItem,Date scanDate) throws EmisBizError { - String packNo=null; + // 子单号处理 - for (String scanBillCode : billCodeArr) { + for (String packNo : billCodeArr) { // 返回原始数据返回 ScanResultItem scanResultItem = new ScanResultItem(); - scanResultItem.setBillCode(scanBillCode); + scanResultItem.setBillCode(packNo); scanResultItem.getData().putAll(scanDataItem); - EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode); + EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(packNo); if(emisTmsPack==null){ scanResultItem.setResult("fail"); scanResultItem.setMessage("合包不存在"); @@ -1379,16 +1379,18 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // packNo=emisTmsPackDtl.getPackNo(); // 所有运单做拆包操作 - List packDtlList=emisTmsPackDtlMapper.selectPackDtlListByPackNo(scanBillCode); + List packDtlList=emisTmsPackDtlMapper.selectPackDtlListByPackNo(packNo); if(!CollectionUtil.isEmpty(packDtlList)){ for (EmisTmsPackDtl emisTmsPackDtl:packDtlList) { + String scanBillCode = emisTmsPackDtl.getBillCode(); String mainBillCode = emisTmsPackDtl.getMainBillCode(); + // 生成扫描记录 EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord(); - emisTmsScanRecord.setBillCode(emisTmsPackDtl.getBillCode()); - emisTmsScanRecord.setMainBillCode(emisTmsPackDtl.getMainBillCode()); + emisTmsScanRecord.setBillCode(scanBillCode); + emisTmsScanRecord.setMainBillCode(mainBillCode); emisTmsScanRecord.setScanType(ScanType.UN_PACKING.opCode); emisTmsScanRecord.setScanDate(scanDate); emisTmsScanRecord.setBagNo(emisTmsPackDtl.getPackNo()); @@ -1418,6 +1420,106 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } } + // 更新合包为拆包状态，整包拆包 +// EmisTmsPack emisTmsPack = new EmisTmsPack(); + emisTmsPack.setPackNo(packNo); + emisTmsPack.setPackStatus("2"); + emisTmsPack.setTotalParcelQty(0); + emisTmsPackMapper.updateEmisTmsPack(emisTmsPack); + + } + + return itemList; + } + + public List doUnPackScan2(List itemList,String[] billCodeArr,Map scanDataItem,Date scanDate) throws EmisBizError { + + String packNo=null; + // 子单号处理 + for (String scanBillCode : billCodeArr) { + // 返回原始数据返回 + ScanResultItem scanResultItem = new ScanResultItem(); + scanResultItem.setBillCode(scanBillCode); + scanResultItem.getData().putAll(scanDataItem); + + EmisTmsPack emisTmsPack=emisTmsPackMapper.selectEmisTmsPackByPackNo(scanBillCode); + if(emisTmsPack==null){ + scanResultItem.setResult("fail"); + scanResultItem.setMessage("合包不存在"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_EXISTS.errorCode); + itemList.add(scanResultItem); + return itemList; + } + + if(!emisTmsPack.getPackStatus().equals("1")){ + throw new EmisBizError(EmisBizErrorType.SCAN_PARAM_ERROR,"合包未组包"); + } + + + if( + !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getCreateSite()) + && !getCurrentUser().getOwnerSiteCode().equals(emisTmsPack.getNextSiteCode()) + ){ + scanResultItem.setResult("fail"); + scanResultItem.setMessage("合包不在当前网点或下一网点，无权拆包"); + scanResultItem.setErrorCode(EmisBizErrorType.SCAN_NO_ALLOW.errorCode); + itemList.add(scanResultItem); + return itemList; + } + + // 检查是否存在 +// EmisTmsPackDtl emisTmsPackDtl =emisTmsPackDtlMapper.selectEmisTmsPackDtlByBillCode(scanBillCode); +// // 找不到组包信息 +// if (emisTmsPackDtl == null) { +// scanResultItem.setResult("fail"); +// scanResultItem.setMessage("未组包"); +// scanResultItem.setErrorCode(EmisBizErrorType.NOT_EXISTS.errorCode); +// itemList.add(scanResultItem); +// return itemList; +// } + +// packNo=emisTmsPackDtl.getPackNo(); + + // 所有运单做拆包操作 + List packDtlList=emisTmsPackDtlMapper.selectPackDtlListByPackNo(scanBillCode); + if(!CollectionUtil.isEmpty(packDtlList)){ + + for (EmisTmsPackDtl emisTmsPackDtl:packDtlList) { + + String mainBillCode = emisTmsPackDtl.getMainBillCode(); + // 生成扫描记录 + EmisTmsScanRecord emisTmsScanRecord = new EmisTmsScanRecord(); + emisTmsScanRecord.setBillCode(emisTmsPackDtl.getBillCode()); + emisTmsScanRecord.setMainBillCode(emisTmsPackDtl.getMainBillCode()); + emisTmsScanRecord.setScanType(ScanType.UN_PACKING.opCode); + emisTmsScanRecord.setScanDate(scanDate); + emisTmsScanRecord.setBagNo(emisTmsPackDtl.getPackNo()); + + // 填充公共数据 + this.fillBillBaseData(emisTmsScanRecord); + + // 插入扫描记录 + addScanRecord(emisTmsScanRecord); + + + // 更新合包运单扫描状态 ,拆包 + emisTmsPackDtl.setBillCode(scanBillCode); + emisTmsPackDtl.setPackStatus("0"); + emisTmsPackDtl.setScanStatus("1"); + emisTmsPackDtl.setScanDate(emisTmsScanRecord.getScanDate()); + emisTmsPackDtl.setScanMan(emisTmsScanRecord.getScanManCode()); + emisTmsPackDtlMapper.updateScanStatus(emisTmsPackDtl); + + // 修改主运单状态,子单做合包扫描，主单不变化 + scanResultItem.getData().put("billWeight", 0f); + scanResultItem.getData().put("totalVolume", 0f); + scanResultItem.getData().put("parcelQty", 0f); + scanResultItem.setResult("success"); + scanResultItem.setMessage("操作成功"); + itemList.add(scanResultItem); + } + } + } // 更新合包为拆包状态，整包拆包