From e4e02918457df9368c9a06baa42149b3dbe65adf Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 13 三月 2026 10:00:39 +0800
Subject: [PATCH] 新增日志和前后端
---
tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java | 509 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 501 insertions(+), 8 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
index 35a7862..2046e48 100644
--- a/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
+++ b/tms/src/main/java/com/ruoyi/tms/service/impl/TmsDispatchOrderServiceImpl.java
@@ -8,13 +8,20 @@
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.domain.model.SysUserImport;
+import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.SystemDataNoEnum;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.DownloadExportUtil;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.ISystemDataNoService;
@@ -55,12 +62,16 @@
private ISysUserService userService;
@Autowired
private ITmsDriverDispatchService tmsDriverDispatchService;
+ @Autowired
+ private ITmsDispatchOrderLogService tmsDispatchOrderLogService;
@Resource
private TmsQuoteDetailMapper tmsQuoteDetailMapper;
@Resource
private TmsQuotePlanMapper tmsQuotePlanMapper;
+ @Autowired
+ private RedisCache redisCache;
@Autowired
ITmsFinanceService tmsFinanceService;
@@ -90,6 +101,29 @@
private TmsPayableFeeMapper tmsPayableFeeMapper;
@Resource
private TmsPayableFeeItemMapper tmsPayableFeeItemMapper;
+ @Resource
+ private TmsProjectMapper tmsProjectMapper;
+
+ @Resource
+ TransportRouteViMapper transportRouteViMapper;
+
+ @Resource
+ private TmsDriverMapper tmsDriverMapper;
+ @Resource
+ private TmsVehicleMapper tmsVehicleMapper;
+ @Resource
+ private TmsConsignorMapper tmsConsignorMapper;
+
+ @Resource
+ private TmsContainerMapper tmsContainerMapper;
+
+ @Resource
+ private TmsShelfMapper tmsShelfMapper;
+
+ @Autowired
+ private ITmsDispatchOrderImportLogService tmsDispatchOrderImportLogService;
+
+
/**
* 鏌ヨ璋冨害鍗曠鐞�
*
@@ -247,8 +281,16 @@
tmsDispatchOrder.setCloseTime(DateUtils.getNowDate());
tmsDispatchOrder.setCloseRemark(tmsDispatchOrder.getCloseRemark());
tmsDispatchOrder.setCloseWhy(tmsDispatchOrder.getCloseWhy());
- tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
- // TODO 鍔犳棩蹇�
+ int result = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
+
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("浣滃簾璋冨害鍗�");
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
return AjaxResult.success("鎿嶄綔鎴愬姛");
}else{
@@ -256,23 +298,49 @@
}
}
+ //濉啓濮旀墭鎶ュ叧淇℃伅
@Override
public int customsOrder(TmsDispatchOrder tmsDispatchOrder) {
- return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
.eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
.set(TmsDispatchOrder::getCustomsServiceProviderId, tmsDispatchOrder.getCustomsServiceProviderId())
.set(TmsDispatchOrder::getCustomsServiceProviderName, tmsDispatchOrder.getCustomsServiceProviderName())
);
-
+
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("濉啓濮旀墭鎶ュ叧淇℃伅");
+
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
+
+ return result;
}
+ //濉啓濮旀墭瑁呭嵏淇℃伅
@Override
public int loadingOrder(TmsDispatchOrder tmsDispatchOrder) {
- return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ int result = tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
.eq(TmsDispatchOrder::getId, tmsDispatchOrder.getId())
.set(TmsDispatchOrder::getLoadingServiceProviderId, tmsDispatchOrder.getLoadingServiceProviderId())
.set(TmsDispatchOrder::getLoadingServiceProviderName, tmsDispatchOrder.getLoadingServiceProviderName())
);
+
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("濉啓濮旀墭瑁呭嵏淇℃伅");
+
+
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
+
+ return result;
}
@Override
@@ -401,6 +469,342 @@
});
}
+ @Override
+ public void importTemplate(String exportKey) {
+ String fileName = ExcelUtil.encodeFileName("tmsDispatchOrderDataTemplate");
+ DownloadExportUtil.deleteDownloadFile(redisCache, exportKey, "0");
+
+ try {
+
+ ExcelUtil<TmsDispatchOrderImport> excelUtil = new ExcelUtil<>(TmsDispatchOrderImport.class);
+ excelUtil.initialize("tmsDispatchOrderDataTemplate", null, Excel.Type.EXPORT);
+
+ TmsDispatchOrderImport tmsDispatchOrderImport = new TmsDispatchOrderImport();
+ tmsDispatchOrderImport.setProjectName("XXX椤圭洰");
+ tmsDispatchOrderImport.setTransportLine("骞夸笢鐪�/鐝犳捣甯�/棣欐床鍖�->棣欐腐鐗瑰埆琛屾斂鍖�");
+ tmsDispatchOrderImport.setRequiredVehicleTypes("10T");
+ tmsDispatchOrderImport.setOrderType("鍩虹璁㈠崟");
+ tmsDispatchOrderImport.setIsCustoms("鏄�");
+ tmsDispatchOrderImport.setIsLoad("鏄�");
+ tmsDispatchOrderImport.setIsUrgent("鏄�");
+ tmsDispatchOrderImport.setOrderTime(DateUtils.getNowDate());
+ tmsDispatchOrderImport.setLatestDeparture(DateUtils.getNowDate());
+ tmsDispatchOrderImport.setLatestArrival(DateUtils.getNowDate());
+ tmsDispatchOrderImport.setOperationMode("鏄�");
+ tmsDispatchOrderImport.setCommissionModel("涓�鏃ユ父");
+ tmsDispatchOrderImport.setMainDriverName("寮犱笁");
+ tmsDispatchOrderImport.setLicensePlate("绮12345");
+ tmsDispatchOrderImport.setShipperRegionLabel("ZXH202512110002");
+ tmsDispatchOrderImport.setReceiverRegionLabel("ZXH202512110001");
+
+ excelUtil.exportExcel(Collections.singletonList(tmsDispatchOrderImport));
+ excelUtil.finishExport(fileName);
+
+ // 璁剧疆涓嬭浇瀹屾垚鐘舵��
+ DownloadExportUtil.setDownloadFile(redisCache, exportKey, fileName);
+ logger.info("Export completed for key: {}, file: {}", exportKey, fileName);
+ } catch (Exception e) {
+ logger.error("Export failed for key: {}, error: {}", exportKey, e.getMessage(), e);
+ DownloadExportUtil.deleteDownloadFile(redisCache, exportKey, "1"); // 璁剧疆澶辫触鐘舵��
+ throw e;
+ }
+ }
+
+ private String verRequired(int line,TmsDispatchOrderImport tmsDispatchOrderImport){
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getProjectName())){
+ return "绗� "+line+" 琛� 椤圭洰鍚嶇О 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getTransportLine())){
+ return "绗� "+line+" 琛� 杩愯緭绾胯矾 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getRequiredVehicleTypes())){
+ return "绗� "+line+" 琛� 涓嬪崟杞﹀瀷 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getOrderType())){
+ return "绗� "+line+" 琛� 璁㈠崟绫诲瀷 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getIsCustoms())){
+ return "绗� "+line+" 琛� 濮旀墭鎶ュ叧 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getIsLoad())){
+ return "绗� "+line+" 琛� 濮旀墭瑁呭嵏 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getIsUrgent())){
+ return "绗� "+line+" 琛� 鏄惁绱ф�� 涓嶈兘涓虹┖锛�";
+ }
+
+ if (tmsDispatchOrderImport.getOrderTime() == null){
+ return "绗� "+line+" 琛� 涓嬪崟鏃堕棿 涓嶈兘涓虹┖锛�";
+ }
+ if (tmsDispatchOrderImport.getLatestArrival() == null){
+ return "绗� "+line+" 琛� 瑕佹眰鏈�鏅氬埌杈炬椂闂� 涓嶈兘涓虹┖锛�";
+ }
+
+
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getOperationMode())){
+ return "绗� "+line+" 琛� 鏄惁鏄嚜钀ヨ溅闃� 涓嶈兘涓虹┖锛�";
+ }
+ if ("0".equals(tmsDispatchOrderImport.getOperationMode())){
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getCommissionModel())){
+ throw new ServiceException("绗�"+line+"琛岃嚜钀ヨ溅闃熷繀濉彁鎴愭ā寮忥紒");
+ }
+ }
+ if ("1".equals(tmsDispatchOrderImport.getOperationMode())){
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getVehicleProviderName())){
+ throw new ServiceException("绗�"+line+"琛� 闈炶嚜钀ヨ溅闃� 蹇呭～杞﹁締鏈嶅姟鍟嗗悕绉帮紒");
+ }
+ }
+
+
+ if ( StringUtils.isEmpty(tmsDispatchOrderImport.getProjectName())){
+ return "绗� "+line+" 琛� 涓嬪崟鏃堕棿 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getMainDriverName())){
+ return "绗� "+line+" 琛� 涓婚┚椹跺憳 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getLicensePlate())){
+ return "绗� "+line+" 琛� 杞︾墝鍙� 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getShipperRegionLabel())){
+ return "绗� "+line+" 琛� 瑁呰揣鐐圭紪鐮� 涓嶈兘涓虹┖锛�";
+ }
+ if (StringUtils.isEmpty(tmsDispatchOrderImport.getReceiverRegionLabel())){
+ return "绗� "+line+" 琛� 鍗歌揣鍦扮紪鐮� 涓嶈兘涓虹┖锛�";
+ }
+
+ return null;
+
+ }
+
+
+ @Override
+ public String importData(List<TmsDispatchOrderImport> list) {
+
+ if (StringUtils.isNull(list) || list.isEmpty())
+ {
+ throw new ServiceException("瀵煎叆璋冨害鍗曟暟鎹笉鑳戒负绌猴紒");
+ }
+ int failureNum = 0;
+ StringBuilder successMsg = new StringBuilder();
+ StringBuilder failureMsg = new StringBuilder();
+ StringBuilder failureDescription = new StringBuilder();
+ int line = 1;
+
+ // 鍒涘缓瀵煎叆鏃ュ織瀵硅薄
+ TmsDispatchOrderImportLog importLog = new TmsDispatchOrderImportLog();
+ importLog.setImportTime(DateUtils.getNowDate());
+ importLog.setFileName("璋冨害鍗曞鍏ユ枃浠�"); // 杩欓噷闇�瑕佹牴鎹疄闄呮儏鍐佃幏鍙栨枃浠跺悕
+ importLog.setOperator(SecurityUtils.getUsername());
+ importLog.setCreateBy(SecurityUtils.getUsername());
+ importLog.setCreateTime(DateUtils.getNowDate());
+
+ for (TmsDispatchOrderImport tmsDispatchOrderImport : list){
+ try
+ {
+ String s = verRequired(line, tmsDispatchOrderImport);
+ if (s != null){
+ throw new ServiceException(s);
+ }
+ TmsDispatchOrder tmsDispatchOrder = new TmsDispatchOrder();
+ String projectName = tmsDispatchOrderImport.getProjectName();
+
+ TmsProject tmsProject = tmsProjectMapper.selectOne(new LambdaQueryWrapper<TmsProject>().
+ eq(TmsProject::getProjectName, projectName)
+ .last("limit 1"));
+ if (tmsProject == null){
+ throw new ServiceException("绗�"+line+"琛岄」鐩笉瀛樺湪锛�");
+ }
+
+ TransportRouteVi transportRouteVi = transportRouteViMapper.selectOne(new LambdaQueryWrapper<TransportRouteVi>()
+ .eq(TransportRouteVi::getTransportRoute, tmsDispatchOrderImport.getTransportLine())
+ .eq(TransportRouteVi::getProjectId, tmsProject.getId())
+ .eq(TransportRouteVi::getCustomerId, tmsProject.getRelatedCustomerId())
+ .eq(TransportRouteVi::getVehicleType, tmsDispatchOrderImport.getRequiredVehicleTypes())
+ .last("limit 1")
+ );
+
+ if (transportRouteVi == null){
+ throw new ServiceException("绗�"+line+"琛岀嚎璺俊鎭笉瀛樺湪锛�");
+ }
+
+ tmsDispatchOrder.setQuoteDetailId(transportRouteVi.getQuoteDetailId());
+ tmsDispatchOrder.setTransportLine(transportRouteVi.getTransportRoute());
+ tmsDispatchOrder.setStartRegionCode(transportRouteVi.getStartRegionCode());
+ tmsDispatchOrder.setEndRegionCode(transportRouteVi.getEndRegionCode());
+ tmsDispatchOrder.setProjectName(transportRouteVi.getProjectName());
+ tmsDispatchOrder.setProjectId(transportRouteVi.getProjectId());
+
+ // 鍏宠仈瀹㈡埛
+ tmsDispatchOrder.setCustomerId(transportRouteVi.getCustomerId());
+ tmsDispatchOrder.setCustomerName(transportRouteVi.getCustomerFullName());
+ tmsDispatchOrder.setCustomerCode(transportRouteVi.getCustomerCode());
+
+ tmsDispatchOrder.setContractId(transportRouteVi.getContractId());
+ tmsDispatchOrder.setContractName(transportRouteVi.getContractName());
+
+ tmsDispatchOrder.setRequiredVehicleTypes(tmsDispatchOrderImport.getRequiredVehicleTypes());
+ tmsDispatchOrder.setQuotePlanId(transportRouteVi.getQuotePlanId());
+
+ tmsDispatchOrder.setOrderType(Integer.valueOf(tmsDispatchOrderImport.getOrderType()));
+ tmsDispatchOrder.setIsCustoms(Integer.valueOf(tmsDispatchOrderImport.getIsCustoms()));
+ tmsDispatchOrder.setIsLoad(Integer.valueOf(tmsDispatchOrderImport.getIsLoad()));
+ tmsDispatchOrder.setIsUrgent(Integer.valueOf(tmsDispatchOrderImport.getIsUrgent()));
+ tmsDispatchOrder.setOrderTime(tmsDispatchOrderImport.getOrderTime());
+ tmsDispatchOrder.setLatestDeparture(tmsDispatchOrderImport.getLatestDeparture());
+ tmsDispatchOrder.setLatestArrival(tmsDispatchOrderImport.getLatestArrival());
+ tmsDispatchOrder.setOperationMode(Integer.valueOf(tmsDispatchOrderImport.getOperationMode()));
+ if (tmsDispatchOrder.getOperationMode() == 0){
+ tmsDispatchOrder.setCommissionModel(Integer.valueOf(tmsDispatchOrderImport.getCommissionModel()));
+ } else {
+
+ TmsServiceProvider tmsServiceProvider = tmsServiceProviderMapper.selectOne(new LambdaQueryWrapper<TmsServiceProvider>().
+ eq(TmsServiceProvider::getServiceName,
+ tmsDispatchOrderImport.getVehicleProviderName())
+ .last("limit 1")
+ );
+ if (tmsServiceProvider == null){
+ throw new ServiceException("绗�"+line+"琛岃溅杈嗘湇鍔″晢涓嶅瓨鍦紒");
+ }
+ tmsDispatchOrder.setVehicleProviderId(tmsServiceProvider.getId());
+ tmsDispatchOrder.setVehicleProviderName(tmsServiceProvider.getServiceName());
+ }
+ TmsDriver tmsDriver = tmsDriverMapper.selectOne(new LambdaQueryWrapper<TmsDriver>().
+ eq(TmsDriver::getDriverName, tmsDispatchOrderImport.getMainDriverName())
+ .last("limit 1")
+ );
+ if (tmsDriver == null){
+ throw new ServiceException("绗�"+line+"琛屼富椹鹃┒鍛樹笉瀛樺湪锛�");
+ }
+
+ tmsDispatchOrder.setMainDriverId(tmsDriver.getId());
+ tmsDispatchOrder.setMainDriverName(tmsDriver.getDriverName());
+ if (!StringUtils.isEmpty(tmsDispatchOrderImport.getAssistantDriverName())){
+
+ TmsDriver tmsDriver1 = tmsDriverMapper.selectOne(new LambdaQueryWrapper<TmsDriver>().
+ eq(TmsDriver::getDriverName, tmsDispatchOrderImport.getAssistantDriverName())
+ .last("limit 1")
+ );
+ if (tmsDriver1 != null){
+ tmsDispatchOrder.setAssistantDriverId(tmsDriver1.getId());
+ tmsDispatchOrder.setAssistantDriverName(tmsDriver1.getDriverName());
+ }
+
+ }
+
+
+ TmsVehicle tmsVehicle = tmsVehicleMapper.selectOne(new LambdaQueryWrapper<TmsVehicle>()
+ .eq(TmsVehicle::getLicensePlate, tmsDispatchOrderImport.getLicensePlate())
+ .last("limit 1")
+ );
+ if (tmsVehicle == null){
+ throw new ServiceException("绗�"+line+"琛岃溅鐗屽彿涓嶅瓨鍦紒");
+ }
+
+ tmsDispatchOrder.setVehicleId(tmsVehicle.getId());
+ tmsDispatchOrder.setLicensePlate(tmsVehicle.getLicensePlate());
+ tmsDispatchOrder.setActualVehicleType(tmsVehicle.getVehicleType());
+
+ TmsConsignor shipper = tmsConsignorMapper.selectOne(new LambdaQueryWrapper<TmsConsignor>()
+ .eq(TmsConsignor::getConsignorCode,
+ tmsDispatchOrderImport.getShipperRegionLabel())
+ .eq(TmsConsignor::getCustomerId, tmsDispatchOrder.getCustomerId())
+ .last("limit 1")
+ );
+
+ if (shipper == null){
+ throw new ServiceException("绗�"+line+"琛岃璐х偣涓嶅瓨鍦紒");
+ }
+ tmsDispatchOrder.setShipperId(shipper.getId());
+ tmsDispatchOrder.setShipperName(shipper.getConsignorName());
+ tmsDispatchOrder.setShipperRegionLabel(shipper.getRegionLabel());
+ tmsDispatchOrder.setShipperAddress(shipper.getAddressDetail());
+ tmsDispatchOrder.setShipperMobile(shipper.getContactPhone());
+ tmsDispatchOrder.setShipperRegionCode(shipper.getRegion());
+
+
+ TmsConsignor receiver = tmsConsignorMapper.selectOne(new LambdaQueryWrapper<TmsConsignor>()
+ .eq(TmsConsignor::getConsignorCode,
+ tmsDispatchOrderImport.getReceiverRegionLabel())
+ .eq(TmsConsignor::getCustomerId, tmsDispatchOrder.getCustomerId())
+ .last("limit 1")
+ );
+ if (receiver == null){
+ throw new ServiceException("绗�"+line+"琛屽嵏璐у湴涓嶅瓨鍦紒");
+ }
+ tmsDispatchOrder.setReceiverId(receiver.getId());
+ tmsDispatchOrder.setReceiverName(receiver.getConsignorName());
+ tmsDispatchOrder.setReceiverRegionLabel(receiver.getRegionLabel());
+ tmsDispatchOrder.setReceiverAddress(receiver.getAddressDetail());
+ tmsDispatchOrder.setReceiverMobile(receiver.getContactPhone());
+ tmsDispatchOrder.setReceiverRegionCode(receiver.getRegion());
+
+ if (!StringUtils.isEmpty(tmsDispatchOrderImport.getContainerNo())){
+ TmsContainer tmsContainer = tmsContainerMapper.selectOne(new LambdaQueryWrapper<TmsContainer>()
+ .eq(TmsContainer::getContainerCode, tmsDispatchOrderImport.getContainerNo())
+ .last("limit 1")
+ );
+ if (tmsContainer == null){
+ throw new ServiceException("绗�"+line+"琛岄泦瑁呯涓嶅瓨鍦紒");
+ }
+ tmsDispatchOrder.setContainerId(tmsContainer.getId());
+ tmsDispatchOrder.setContainerNo(tmsContainer.getContainerCode());
+ }
+
+ if (!StringUtils.isEmpty(tmsDispatchOrderImport.getShelfCode())){
+ TmsShelf tmsShelf = tmsShelfMapper.selectOne(new LambdaQueryWrapper<TmsShelf>()
+ .eq(TmsShelf::getShelfCode, tmsDispatchOrderImport.getShelfCode())
+ .last("limit 1")
+ );
+ if (tmsShelf == null){
+ throw new ServiceException("绗�"+line+"琛屾墭鏋朵笉瀛樺湪锛�");
+ }
+ tmsDispatchOrder.setShelfId(tmsShelf.getId());
+ tmsDispatchOrder.setShelfCode(tmsShelf.getShelfCode());
+ }
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.DL);
+ tmsDispatchOrder.setDispatchNo(noByKey);
+
+ tmsDispatchOrder.setCreateBy(SecurityUtils.getUsername());
+ tmsDispatchOrder.setCreateTime(DateUtils.getNowDate());
+ tmsDispatchOrderMapper.insertTmsDispatchOrder(tmsDispatchOrder);
+ }catch (Exception e) {
+ failureNum++;
+ String msg = "<br/>" + "璋冨害鍗曠"+line+"琛屽鍏ュけ璐ワ細";
+ failureMsg.append(msg + e.getMessage());
+
+ // 璁板綍澶辫触璇存槑锛屽寘鍚鍙峰拰澶辫触鍘熷洜
+ failureDescription.append("绗�" + line + "琛岋細" + e.getMessage()).append("\n");
+
+ log.error(msg, e);
+ }finally {
+ line++;
+ }
+ }
+
+ // 璁剧疆瀵煎叆鏃ュ織鐨勭粺璁′俊鎭�
+ importLog.setSuccessCount(list.size() - failureNum);
+ importLog.setFailureCount(failureNum);
+ importLog.setFailureDescription(failureDescription.toString());
+
+ // 淇濆瓨瀵煎叆鏃ュ織
+ try {
+ tmsDispatchOrderImportLogService.insertTmsDispatchOrderImportLog(importLog);
+ } catch (Exception e) {
+ log.error("淇濆瓨瀵煎叆鏃ュ織澶辫触锛�", e);
+ }
+
+ if (failureNum > 0)
+ {
+ failureMsg.insert(0, "寰堟姳姝夛紝瀵煎叆澶辫触锛佸叡 " + failureNum + " 鏉℃暟鎹牸寮忎笉姝ｇ‘锛岄敊璇涓嬶細");
+ throw new ServiceException(failureMsg.toString());
+ }
+ else
+ {
+ successMsg.insert(0, "鎭枩鎮紝鏁版嵁宸插叏閮ㄥ鍏ユ垚鍔燂紒鍏� " + list.size() + " 鏉�");
+ }
+
+ return successMsg.toString() ;
+ }
/**
* 鏂板璋冨害鍗曠鐞�
@@ -415,6 +819,27 @@
tmsDispatchOrder.setDispatchNo(noByKey);
tmsDispatchOrder.setCreateBy(SecurityUtils.getUsername());
+ tmsDispatchOrder.setCreateTime(DateUtils.getNowDate());
+ int result = tmsDispatchOrderMapper.insertTmsDispatchOrder(tmsDispatchOrder);
+
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("鏂板璋冨害鍗�");
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
+
+ return result;
+ }
+ @Override
+ public int insertTmsDispatchOrder2(TmsDispatchOrder tmsDispatchOrder)
+ {
+ String noByKey = systemDataNoService.getNoByKey(SystemDataNoEnum.DL);
+
+ tmsDispatchOrder.setDispatchNo(noByKey);
+ tmsDispatchOrder.setCreateBy("AGENTS");
tmsDispatchOrder.setCreateTime(DateUtils.getNowDate());
return tmsDispatchOrderMapper.insertTmsDispatchOrder(tmsDispatchOrder);
}
@@ -444,13 +869,69 @@
tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
tmsDispatchOrder.setUpdateTime(DateUtils.getNowDate());
- return tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
+ int result = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
+
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("缂栬緫璋冨害鍗�");
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
+
+ return result;
+ }
+ @Override
+ public int updateTmsDispatchOrder2(TmsDispatchOrder tmsDispatchOrder)
+ {
+ tmsDispatchOrder.setUpdateBy(SecurityUtils.getUsername());
+
+ tmsDispatchOrder.setUpdateTime(DateUtils.getNowDate());
+ int result = tmsDispatchOrderMapper.updateTmsDispatchOrder(tmsDispatchOrder);
+
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("濉啓瀹為檯杩愯緭璁板綍");
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
+
+ return result;
}
@Override
+ public int updateTmsDispatchOrder(YpdddjDispatchOrderVo dispatchOrderVo)
+ {
+ return tmsDispatchOrderMapper.update(new LambdaUpdateWrapper<TmsDispatchOrder>()
+ .in(TmsDispatchOrder::getDispatchNo,dispatchOrderVo.getDispatchNos())
+ .set(dispatchOrderVo.getShipperId()!=null,TmsDispatchOrder::getShipperId,dispatchOrderVo.getShipperId())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperName()),TmsDispatchOrder::getShipperName,dispatchOrderVo.getShipperName())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperRegionLabel()),TmsDispatchOrder::getShipperRegionLabel,dispatchOrderVo.getShipperRegionLabel())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperAddress()),TmsDispatchOrder::getShipperAddress,dispatchOrderVo.getShipperAddress())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperMobile()),TmsDispatchOrder::getShipperMobile,dispatchOrderVo.getShipperMobile())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getShipperRegionCode()),TmsDispatchOrder::getShipperRegionCode,dispatchOrderVo.getShipperRegionCode())
+
+ .set(dispatchOrderVo.getReceiverId()!=null,TmsDispatchOrder::getReceiverId,dispatchOrderVo.getReceiverId())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverName()),TmsDispatchOrder::getReceiverName,dispatchOrderVo.getReceiverName())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverRegionLabel()),TmsDispatchOrder::getReceiverRegionLabel,dispatchOrderVo.getReceiverRegionLabel())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverAddress()),TmsDispatchOrder::getReceiverAddress,dispatchOrderVo.getReceiverAddress())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverMobile()),TmsDispatchOrder::getReceiverMobile,dispatchOrderVo.getReceiverMobile())
+ .set(StringUtils.isNotEmpty(dispatchOrderVo.getReceiverRegionCode()),TmsDispatchOrder::getReceiverRegionCode,dispatchOrderVo.getReceiverRegionCode())
+
+ .set(TmsDispatchOrder::getUpdateBy,SecurityUtils.getUsername())
+ .set(TmsDispatchOrder::getUpdateTime,DateUtils.getNowDate())
+ );
+
+ }
+
+ //鎵胯繍鍗曟墦鍗�
+ @Override
public int printDispatchOrder(TmsDispatchOrder tmsDispatchOrder)
{
- return tmsDispatchOrderMapper.update(null,new LambdaUpdateWrapper<TmsDispatchOrder>()
+ int result = tmsDispatchOrderMapper.update(null,new LambdaUpdateWrapper<TmsDispatchOrder>()
.eq(TmsDispatchOrder::getId,tmsDispatchOrder.getId())
.set(TmsDispatchOrder::getIsPrint,0)
.setSql("print_count = IFNULL(print_count, 0) + 1")
@@ -465,7 +946,19 @@
.set(TmsDispatchOrder::getWeight,tmsDispatchOrder.getWeight())
.set(TmsDispatchOrder::getContactName,tmsDispatchOrder.getContactName())
.set(TmsDispatchOrder::getContactPhone,tmsDispatchOrder.getContactPhone())
- );
+ );
+
+ if (result > 0) {
+ TmsDispatchOrderLog log = new TmsDispatchOrderLog();
+ log.setHeadId(tmsDispatchOrder.getId());
+ log.setCreateBy(SecurityUtils.getUsername());
+ log.setCreateTime(DateUtils.getNowDate());
+ log.setNode("鎵胯繍鍗曟墦鍗�");
+
+ tmsDispatchOrderLogService.insertTmsDispatchOrderLog(log);
+ }
+
+ return result;
}
/**
--
Gitblit v1.8.0