From bc924cd3ee9df23b9a430f71641165b6bba70d63 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 18 Jun 2024 00:16:08 +0800 Subject: [PATCH] md --- .../emis/EmisWaybillTransferController.java | 9 +++++ .../erp/emis/service/EmisBaseService.java | 35 ++++++------------- .../impl/EmisTmsScanRecordServiceImpl.java | 29 ++++++++++++--- 3 files changed, 43 insertions(+), 30 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java index 54eefc7b7..ff8fef5b3 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillTransferController.java @@ -11,6 +11,7 @@ package com.xdadan.erp.web.emis; +import java.math.BigDecimal; import java.util.*; import javax.servlet.http.HttpServletResponse; @@ -126,6 +127,7 @@ public class EmisWaybillTransferController extends EmisBaseController "transferBillcode": "转单同行单号", "destCity": "目的城市", "scanDate": "2024-05-02 12:03:05", + "transferResean": "", "scanWeight": "0.0" } ] @@ -144,6 +146,13 @@ public class EmisWaybillTransferController extends EmisBaseController scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode()); scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity()); scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,emisWaybillTransfer.getTransferDate())); + scanDateItem.put("transferResean", emisWaybillTransfer.getTransferResean()); + scanDateItem.put("transferFee", emisWaybillTransfer.getTransferFee()); + scanDateItem.put("linkMan", emisWaybillTransfer.getLinkMan()); + scanDateItem.put("linkPhone", emisWaybillTransfer.getLinkPhone()); + scanDateItem.put("transferWeight", emisWaybillTransfer.getTransferWeight()); + scanDateItem.put("transferVolume", emisWaybillTransfer.getTransferVolume()); + scanDateItem.put("scanWeight", "0.0"); scanDataList.add(scanDateItem); scanInfo.setScanData(scanDataList); 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 2b239b2ea..d957c98d5 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 @@ -453,43 +453,28 @@ public class EmisBaseService { return content; } + /** * 转件登记 - * @param billCode - * @param transferCode - * @param transferBillcode - * @param destCity + * @param emisWaybillTransfer */ - public void wayBillTransfer(String billCode,String transferCode,String transferBillcode,String destCity){ + public void wayBillTransfer(EmisWaybillTransfer emisWaybillTransfer){ EmisWaybill upd=new EmisWaybill(); - upd.setBillCode(billCode); - upd.setTransferCode(transferCode); - upd.setTransferBillcode(transferBillcode); + upd.setBillCode(emisWaybillTransfer.getBillCode()); + upd.setTransferCode(emisWaybillTransfer.getTransferExpress()); + upd.setTransferBillcode(emisWaybillTransfer.getTransferBillCode()); upd.setBlDispFd("1");// 转单标识 emisWaybillMapper.updateTransferInfo(upd); - // 插入转件记录表 - EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer(); - emisWaybillTransfer.setBillCode(billCode); - emisWaybillTransfer.setTransferExpress(transferCode); - emisWaybillTransfer.setTransferBillCode(transferBillcode); - emisWaybillTransfer.setTransferCity(destCity); - emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer); - // 插入跟踪记录表 EmisTmsTransferTrace emisTmsTransferTrace=new EmisTmsTransferTrace(); - emisTmsTransferTrace.setBillCode(billCode); - emisTmsTransferTrace.setTransferBillCode(transferBillcode); - emisTmsTransferTrace.setTransferExpress(transferCode); + emisTmsTransferTrace.setBillCode(emisWaybillTransfer.getBillCode()); + emisTmsTransferTrace.setTransferBillCode(emisWaybillTransfer.getTransferBillCode()); + emisTmsTransferTrace.setTransferExpress(emisWaybillTransfer.getTransferExpress()); // 先删除历史跟踪，插入新的跟踪记录 - emisTmsTransferTraceMapper.deleteEmisTmsTransferTraceByBillCode(billCode); + emisTmsTransferTraceMapper.deleteEmisTmsTransferTraceByBillCode(emisWaybillTransfer.getBillCode()); emisTmsTransferTraceMapper.insertEmisTmsTransferTrace(emisTmsTransferTrace); -// int rst=emisTmsTransferTraceMapper.checkUnique(emisTmsTransferTrace); -// if(rst==0){ -// emisTmsTransferTraceMapper.insertEmisTmsTransferTrace(emisTmsTransferTrace); -// } - } /** 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 4fc49a5eb..d7b99ddd2 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 @@ -34,6 +34,7 @@ import com.xdadan.erp.emis.mapper.EmisTmsTransferTraceMapper; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.utils.Kd100Helper; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -625,20 +626,38 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // "scanWeight": "0.0" - String transferCode = (String)scanDataItem.get("transferCode"); - String transferBillcode = (String)scanDataItem.get("transferBillcode"); - String destCity = (String)scanDataItem.get("destCity"); + String transferCode =MapUtils.getString(scanDataItem,"transferCode",null) ; + String transferBillcode = MapUtils.getString(scanDataItem,"transferBillcode",null) ; + String destCity =MapUtils.getString(scanDataItem,"destCity",null) ; + String transferResean =MapUtils.getString(scanDataItem,"transferResean",null) ; + String linkMan =MapUtils.getString(scanDataItem,"linkMan",null) ; + String linkPhone =MapUtils.getString(scanDataItem,"linkPhone",null) ; + Float transferWeight =MapUtils.getFloat(scanDataItem,"transferWeight",0.0f) ; + Float transferVolume =MapUtils.getFloat(scanDataItem,"transferVolume",0.0f) ; emisTmsScanRecord.setPreOrNextStation(destCity); // 获取快递公司 String transferCompanyName=DictUtils.getDictLabel("emis_express_code",transferCode); emisTmsScanRecord.setRemark("["+transferCompanyName+" "+transferBillcode +"] 发往["+destCity+"]"); + // emisTmsScanRecord.setScanSite(transferCompanyName); // emisTmsScanRecord.setScanMan(transferCompanyName); - // 更新waybill做转单 - wayBillTransfer(emisTmsScanRecord.getBillCode(),transferCode,transferBillcode,destCity); + // 插入转件记录表 + EmisWaybillTransfer emisWaybillTransfer = new EmisWaybillTransfer(); + emisWaybillTransfer.setBillCode(emisTmsScanRecord.getBillCode()); + emisWaybillTransfer.setTransferExpress(transferCode); + emisWaybillTransfer.setTransferBillCode(transferBillcode); + emisWaybillTransfer.setTransferCity(destCity); + emisWaybillTransfer.setLinkMan(linkMan); + emisWaybillTransfer.setLinkPhone(linkPhone); + emisWaybillTransfer.setTransferWeight(BigDecimal.valueOf(transferWeight)); + emisWaybillTransfer.setTransferVolume(BigDecimal.valueOf(transferVolume)); + emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer); + + // 更新waybill做转单 + wayBillTransfer(emisWaybillTransfer); changeWaybillCurrentSite(emisTmsScanRecord.getBillCode(),emisTmsScanRecord.getScanSiteCode());