From ab31909b0fc47e71d8ec0cfa1c84758a0f54311c Mon Sep 17 00:00:00 2001 From: linfso Date: Mon, 3 Jun 2024 15:56:54 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisCommonController.java | 19 ++++++ .../emis/EmisWaybillTransferController.java | 58 +++++++++++++++++- .../erp/emis/domain/EmisTmsPackDtl.java | 3 - .../erp/emis/domain/EmisTmsSiteBatchDtl.java | 3 + .../xdadan/erp/emis/domain/EmisWaybill.java | 2 +- .../erp/emis/mapper/EmisWaybillMapper.java | 4 ++ .../erp/emis/service/EmisBaseService.java | 16 ++--- .../impl/EmisWaybillTransferServiceImpl.java | 8 ++- .../resources/mapper/EmisWaybillMapper.xml | 61 ++++++++++++++++--- 9 files changed, 147 insertions(+), 27 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index b91f98989..6f1afc875 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -151,6 +151,25 @@ public class EmisCommonController extends BaseController } } + /** + * 获取批次号 + */ + @RequestMapping(value = "/getTmsGroupBatchNo") + public AjaxResult getTmsGroupBatchNo() + { + try { + String YYYYMMDDHH = "yyyyMMddHH"; + + String batchKey= "TGB-"+DateUtils.parseDateToStr(YYYYMMDDHH,new Date()); + Long lockNo = redissonService.addAndGetLong(batchKey,1L); + String batchNo =batchKey+ "-" +StringUtils.leftPad(String.valueOf(lockNo),4,"0"); + return AjaxResult.success("获取成功",batchNo); + }catch (Exception ex){ + ex.printStackTrace(); + return AjaxResult.error(ex.getMessage()); + } + } + /** * 获取进仓单号 */ 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 3b6cfec09..fc5eafd7b 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,9 +11,16 @@ package com.xdadan.erp.web.emis; -import java.util.List; +import java.util.*; import javax.servlet.http.HttpServletResponse; + +import com.xdadan.erp.common.utils.DateUtils; +import com.xdadan.erp.emis.domain.enumtype.ScanType; +import com.xdadan.erp.emis.domain.exception.EmisBizError; +import com.xdadan.erp.emis.domain.vo.scan.ScanInfo; +import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.dao.DuplicateKeyException; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -48,6 +55,9 @@ public class EmisWaybillTransferController extends BaseController @Autowired private IEmisWaybillTransferService emisWaybillTransferService; + @Autowired + private IEmisTmsScanRecordService emisTmsScanRecordService; + /** * 查询运单转件表列表 */ @@ -91,7 +101,51 @@ public class EmisWaybillTransferController extends BaseController @PostMapping public AjaxResult add(@RequestBody EmisWaybillTransfer emisWaybillTransfer) { - return toAjax(emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer)); + int ret=emisWaybillTransferService.insertEmisWaybillTransfer(emisWaybillTransfer); + + // 做转单扫描登记 + /* + { + "scanType": "80", + "opType": "1-检查 2-确认", + "scanData": [ + { + "billCode": "T001,T002,T002", + "transferCode": "转单同行快递代码", + "transferBillcode": "转单同行单号", + "destCity": "目的城市", + "scanDate": "2024-05-02 12:03:05", + "scanWeight": "0.0" + } + ] + } + */ + + ScanInfo scanInfo = new ScanInfo(); + List> scanDataList = new ArrayList<>(); + scanInfo.setOpType(2); + scanInfo.setScanType(ScanType.TRANSFER.opCode); + Map scanDateItem = new HashMap<>(); + scanDateItem.put("billCode",emisWaybillTransfer.getBillCode()); + scanDateItem.put("transferCode",emisWaybillTransfer.getTransferExpress()); + scanDateItem.put("transferBillcode",emisWaybillTransfer.getTransferBillCode()); + scanDateItem.put("destCity",emisWaybillTransfer.getTransferCity()); + scanDateItem.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,new Date())); + scanDateItem.put("scanWeight", "0.0"); + scanDataList.add(scanDateItem); + scanInfo.setScanData(scanDataList); + + try { + emisTmsScanRecordService.scan(scanInfo); + } catch (EmisBizError emisBizError) { + emisBizError.printStackTrace(); + return AjaxResult.error(emisBizError.getMessage()); + }catch (Exception e) { + e.printStackTrace(); + return AjaxResult.error("数据异常!"); + } + + return AjaxResult.success("成功",ret); } /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java index d2fbd94be..5ffb54c00 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsPackDtl.java @@ -49,10 +49,7 @@ public class EmisTmsPackDtl extends BaseEntity /* 扫描员 */ private String scanMan; - - // 扩展参数 private EmisWaybill waybillDetail; - } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java index e6ed3264a..60fe76d46 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatchDtl.java @@ -51,4 +51,7 @@ public class EmisTmsSiteBatchDtl extends BaseEntity /* 扫描站点 */ private String scanSite; + // 扩展参数 + private EmisWaybill waybillDetail; + } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java index 24faaeb78..e5cf3edb2 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java @@ -409,7 +409,7 @@ public class EmisWaybill extends BaseEntity // 目的地名称 private String destinationName; // 目的网点名称 - private String dispatchUnderlingSiteName; + private String dispatjchUnderlingSiteName; // 派件网点名称,派件人 private String dispatchSiteName; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java index a523af310..5bcdadd2c 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWaybillMapper.java @@ -105,4 +105,8 @@ public interface EmisWaybillMapper extends BaseMapper // 更新上一站，下一站 public int updatePreOrNextSiteByBillCode(EmisWaybill emisWaybill); + + // 转件登记 + public int updateTransferInfo(EmisWaybill emisWaybill); + } 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 b029b6e31..e67765632 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 @@ -299,17 +299,13 @@ public class EmisBaseService { * @param destCity */ public void wayBillTransfer(String billCode,String transferCode,String transferBillcode,String destCity){ - EmisWaybill waybill=getWaybillByBillCode(billCode); - if(waybill!=null){ - EmisWaybill upd=new EmisWaybill(); - upd.setId(waybill.getId()); - upd.preUpdate(); - upd.setTransferCode(transferCode); - upd.setTransferBillcode(transferBillcode); - upd.setBlDispFd("1");// 转单标识 + EmisWaybill upd=new EmisWaybill(); + upd.setBillCode(billCode); + upd.setTransferCode(transferCode); + upd.setTransferBillcode(transferBillcode); + upd.setBlDispFd("1");// 转单标识 + emisWaybillMapper.updateTransferInfo(upd); - emisWaybillMapper.updateEmisWaybill(upd); - } } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java index 84d8b6f01..81c388681 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillTransferServiceImpl.java @@ -11,6 +11,8 @@ package com.xdadan.erp.emis.service.impl; import java.util.List; + +import com.xdadan.erp.emis.service.IEmisTmsScanRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xdadan.erp.emis.domain.EmisWaybillTransfer; @@ -24,11 +26,13 @@ import com.xdadan.erp.emis.service.IEmisWaybillTransferService; * @date 2024-05-22 01:07:48 */ @Service -public class EmisWaybillTransferServiceImpl implements IEmisWaybillTransferService +public class EmisWaybillTransferServiceImpl implements IEmisWaybillTransferService { @Autowired private EmisWaybillTransferMapper emisWaybillTransferMapper; + + /** * 查询运单转件表 * @@ -62,6 +66,8 @@ public class EmisWaybillTransferServiceImpl implements IEmisWaybillTransferServi @Override public int insertEmisWaybillTransfer(EmisWaybillTransfer emisWaybillTransfer) { + // 做一次转件扫描记录 + return emisWaybillTransferMapper.insertEmisWaybillTransfer(emisWaybillTransfer); } diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 3877d65b0..5de6a657f 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -1022,7 +1022,15 @@ - update emis_waybill set bl_print='1',print_man_code=#{printManCode},print_site=#{printSite},print_date=now(),print_count=print_count+1 where bill_code=#{billCode} + update emis_waybill set + bl_print='1', + print_man_code=#{printManCode}, + print_site=#{printSite}, + print_date=now(), + print_count=print_count+1 + ,update_by = #{updateBy} + ,update_site = #{updateSite} + where bill_code=#{billCode} @@ -1038,15 +1046,30 @@ where bill_code=#{billCode} - - update emis_waybill set - bl_is_question = #{blIsQuestion}, + update emis_waybill + + bl_is_question = '1', problem_type = #{problemType}, problem_cause = #{problemCause}, problem_delay_days = #{problemDelayDays} ,update_by = #{updateBy} - ,update_site = #{updateSite}, + ,update_site = #{updateSite} + + where bill_code=#{billCode} + + + + update emis_waybill + + bl_disp_fd ='1', + transfer_code = #{transferCode}, + transfer_billcode = #{transferBillcode}, + disp_fd_date = #{dispFdDate}, + disp_fd_reason = #{dispFdReason} + ,update_by = #{updateBy} + ,update_site = #{updateSite} + where bill_code=#{billCode} @@ -1064,23 +1087,41 @@ - update emis_waybill set waybill_status=#{waybillStatus} where bill_code=#{billCode} + update emis_waybill + + waybill_status=#{waybillStatus} + ,update_by = #{updateBy} + ,update_site = #{updateSite} + + where bill_code=#{billCode} - update emis_waybill set order_status=#{orderStatus} where bill_code=#{billCode} + update emis_waybill set order_status=#{orderStatus} + ,update_by = #{updateBy} + ,update_site = #{updateSite} + where bill_code=#{billCode} - update emis_waybill set order_status=#{orderStatus} where order_sn=#{orderSn} + update emis_waybill set order_status=#{orderStatus} + ,update_by = #{updateBy} + ,update_site = #{updateSite} + where order_sn=#{orderSn} - update emis_waybill set del_flag='1' where id = #{id} + update emis_waybill set del_flag='1' + ,update_by = #{updateBy} + ,update_site = #{updateSite} + where id = #{id} - update emis_waybill set del_flag='1 where id in + update emis_waybill set del_flag='1 + ,update_by = #{updateBy} + ,update_site = #{updateSite} + where id in #{id}