From 059b0640b8d479376baa66161ca56a3b1f187789 Mon Sep 17 00:00:00 2001 From: aike <17730485278@139.com> Date: Wed, 9 Jul 2025 17:00:46 +0800 Subject: [PATCH] =?UTF-8?q?demand:=20=20=E7=BB=84=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E7=9B=91=E6=8E=A7=EF=BC=8C?= =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=AB=E6=8F=8F=E6=BC=8F=E7=BB=84=E6=89=B9?= =?UTF-8?q?=E6=AC=A1=E6=94=B9=E4=B8=BA=E7=A1=AC=E5=88=A0=E9=99=A4=20commit?= =?UTF-8?q?ter:=20heyu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/emis/domain/EmisTmsSiteBatch.java | 20 +++++++++++++++++++ .../erp/emis/domain/EmisTmsSiteBatchDtl.java | 4 ++++ .../mapper/EmisTmsSiteBatchMissMapper.java | 2 ++ .../impl/EmisTmsSiteBatchMissServiceImpl.java | 2 +- .../mapper/EmisTmsSiteBatchMissMapper.xml | 8 +++++++- 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java index 8c4d3740a..59e24c334 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsSiteBatch.java @@ -11,8 +11,10 @@ package com.xdadan.erp.emis.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.xdadan.erp.common.annotation.audit.DataAuditField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.xdadan.erp.common.annotation.Excel; @@ -48,6 +50,8 @@ public class EmisTmsSiteBatch extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date batchDate; /* 供应商代码 */ + @TableField + @DataAuditField(fieldComment = "供应商编码") private String supplierCode; /* 供应商名称 */ private String supplierName; @@ -56,24 +60,36 @@ public class EmisTmsSiteBatch extends BaseEntity /* 所属产品 */ private String productType; /* 批次类型 1-网点组批次 2-总部组批 */ + @TableField + @DataAuditField(fieldComment = "批次类型") private String batchType; /* 运输方式: 空运 陆运 海运 */ + @TableField + @DataAuditField(fieldComment = "运输方式") private String transType; /* 起始网点 */ + @TableField + @DataAuditField(fieldComment = "起始网点") private String startSiteCode; /* 发件国家 */ private String sendCountry; /* 下一网点 */ + @TableField + @DataAuditField(fieldComment = "下一网点") private String nextSiteCode; /* 航空单号 */ private String airBilllNo; /* 预计出发时间 */ @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + @TableField + @DataAuditField(fieldComment = "预计出发时间") private Date etd; /* 预计到达时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") private Date eta; /* 车牌号 */ + @TableField + @DataAuditField(fieldComment = "运输号") private String carNo; /* 船次号 */ private String shipNo; @@ -86,8 +102,12 @@ public class EmisTmsSiteBatch extends BaseEntity /* 目的国家名称 */ private String destCountryName; /* 运输重量 */ + @TableField + @DataAuditField(fieldComment = "运输重量") private BigDecimal transWeight; /* 包裹数 */ + @TableField + @DataAuditField(fieldComment = "包裹数") private Integer packNum; /* 总票数 */ private Integer totalParcelQty; 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 5a512f521..ece69780d 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 @@ -11,8 +11,10 @@ package com.xdadan.erp.emis.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.xdadan.erp.common.annotation.audit.DataAuditField; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.xdadan.erp.common.annotation.Excel; @@ -39,6 +41,8 @@ public class EmisTmsSiteBatchDtl extends BaseEntity @TableId(value = "id", type = IdType.AUTO) private Long id; /* 运单号 */ + @TableField + @DataAuditField(fieldComment = "组批次运单号") private String billCode; /* 批次代码 */ private String batchNo; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java index d5c03bcb1..5dcf45f1a 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsSiteBatchMissMapper.java @@ -85,4 +85,6 @@ public interface EmisTmsSiteBatchMissMapper { * @param billCodes */ void deleteByBillCodes(@Param("billCodes") List billCodes); + + void deleteReally(String lineCode); } \ No newline at end of file diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index a0b36c258..1a8f8a4f0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -146,7 +146,7 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements @Override public void autoScanSiteBatch(String lineCode) { try { - emisTmsSiteBatchMissMapper.deleteAll(lineCode); + emisTmsSiteBatchMissMapper.deleteReally(lineCode); long startTime = System.currentTimeMillis(); int pageSize = 1000; int offset = 0; diff --git a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml index 4055f7c67..d0804c1b3 100644 --- a/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissMapper.xml @@ -140,7 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" w.send_country, c1.name as send_country_name, w.destination_code, n.dest_name as destination_name, w.bl_is_question, l.line_name as line_name, w.receive_country, c2.name as receive_country_name, w.send_date, w.bl_sign, w.sign_date, - w.product_type, w.payment_type, w.parcel_qty, w.bill_weight, w.total_volume, w.volume_weight, w.settlement_weight, w.freight, w.remark as waybill_remark, w.fee_remark, null as manager, null as trans_manager, @@ -358,6 +357,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + delete from emis_tms_site_batch_miss + + where line_code = #{lineCode} + + + update emis_tms_site_batch_miss set del_flag = '1' where bill_code in