From f649526110db99cce2e326250c1f75cef262b594 Mon Sep 17 00:00:00 2001 From: linfso Date: Sun, 1 Sep 2024 17:03:54 +0800 Subject: [PATCH] md --- .../erp/emis/domain/EmisWarehouseIn.java | 2 + .../erp/emis/domain/EmisWarehouseInBatch.java | 32 ++++++- .../erp/emis/domain/EmisWarehouseInDtl.java | 6 +- .../emis/mapper/EmisWarehouseInDtlMapper.java | 3 + .../mapper/EmisWarehouseInBatchMapper.xml | 88 ++++++++++++++---- .../mapper/EmisWarehouseInDtlMapper.xml | 93 ++++++++++++++----- 6 files changed, 175 insertions(+), 49 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java index 5063bbfb0..645ff07f8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java @@ -64,6 +64,8 @@ public class EmisWarehouseIn extends BaseEntity // 扩展参数 private EmisWaybill waybillDetail; + + // 入仓批次信息 private List stockInBatchList; diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java index f195c5a55..d0f45a3f7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java @@ -19,6 +19,8 @@ import com.xdadan.erp.common.core.domain.TreeEntity; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import java.util.List; + import lombok.Data; @@ -35,11 +37,11 @@ public class EmisWarehouseInBatch extends BaseEntity /* id */ private Long id; - /* 进仓序列号 系统生成 */ + /* 进仓序号 */ private String serialNo; /* 进仓单号 */ private String inNo; - /* 进仓子批次单号in_no+001 002 */ + /* 进仓后缀+001 002 */ private String inBatchNo; /* 客户编号 */ private String customerCode; @@ -52,20 +54,42 @@ public class EmisWarehouseInBatch extends BaseEntity /* 运输工具编号 例如车牌号等 */ private String transCarNo; /* 进仓日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date entryDate; /* 客户确认状态 0-未确认 1-确认 2-部分确认3-异常反馈 */ private String confirmStatus; /* 确认时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date confirmDate; /* 状态 */ private String status; + /* 代垫运费 1-是 */ + private String blPrepareInFreight; + /* 代垫运费 */ + private BigDecimal prepareInEstFee; + /* 实际运费 */ + private BigDecimal prepareInRealFee; + /* 快递公司 */ + private String prepareInExpress; + /* 快递单号 */ + private String prepareInBillCode; + /* 自定义标识 */ + private String prepareInRemark; + /* 供应商 */ + private String prepareInSupplier; + /* 包装类型 */ + private String packType; /* 总件数 */ private Integer totalParcelQty; /* 总体积 */ private BigDecimal totalVolume; /* 总重量 */ private BigDecimal totalWeight; + /* 进仓图片链接 */ + private String picUrl; + + + + List cargoList; } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java index 739b14ec8..d9182d5eb 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java @@ -35,10 +35,8 @@ public class EmisWarehouseInDtl extends BaseEntity /* id */ private Long id; - /* 进仓主单号 */ - private String inNo; - /* 进仓子单号 */ - private String inChildNo; + /* 进仓序号 */ + private String inSerialNo; /* 货物编码 */ private String goodsCode; /* 货物名称 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java index 4bd053879..2759088b1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java @@ -36,6 +36,9 @@ public interface EmisWarehouseInDtlMapper extends BaseMapper */ public List selectEmisWarehouseInDtlList(EmisWarehouseInDtl emisWarehouseInDtl); + + public List selectWarehouseInDtlListBySerialNo(String inSerialNo); + /** * 新增 * diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml index 1d6260185..f9f258834 100644 --- a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml @@ -18,25 +18,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + - select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, total_parcel_qty, total_volume, total_weight, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_batch + select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_batch - - - - + + + insert into emis_warehouse_in_batch @@ -90,9 +113,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" confirm_status, confirm_date, status, + bl_prepare_in_freight, + prepare_in_est_fee, + prepare_in_real_fee, + prepare_in_express, + prepare_in_bill_code, + prepare_in_remark, + prepare_in_supplier, + pack_type, total_parcel_qty, total_volume, total_weight, + pic_url, remark, tenant_id, del_flag, @@ -102,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{id}, #{serialNo}, @@ -117,9 +149,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{confirmStatus}, #{confirmDate}, #{status}, + #{blPrepareInFreight}, + #{prepareInEstFee}, + #{prepareInRealFee}, + #{prepareInExpress}, + #{prepareInBillCode}, + #{prepareInRemark}, + #{prepareInSupplier}, + #{packType}, #{totalParcelQty}, #{totalVolume}, #{totalWeight}, + #{picUrl}, #{remark}, #{tenantId}, #{delFlag}, @@ -129,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + @@ -147,9 +188,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" confirm_status = #{confirmStatus}, confirm_date = #{confirmDate}, status = #{status}, + bl_prepare_in_freight = #{blPrepareInFreight}, + prepare_in_est_fee = #{prepareInEstFee}, + prepare_in_real_fee = #{prepareInRealFee}, + prepare_in_express = #{prepareInExpress}, + prepare_in_bill_code = #{prepareInBillCode}, + prepare_in_remark = #{prepareInRemark}, + prepare_in_supplier = #{prepareInSupplier}, + pack_type = #{packType}, total_parcel_qty = #{totalParcelQty}, total_volume = #{totalVolume}, total_weight = #{totalWeight}, + pic_url = #{picUrl}, remark = #{remark}, tenant_id = #{tenantId}, del_flag = #{delFlag}, @@ -168,9 +218,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_warehouse_in_batch where id in + delete from emis_warehouse_in_batch where id in #{id} + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml index 5aa00288f..1e3a35b4f 100644 --- a/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml @@ -1,13 +1,12 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + - - + @@ -39,16 +38,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, in_no, in_child_no, goods_code, goods_name, cargo_qty, abnormal_qty, out_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, material, purpose, ingredients, manufacturer, supplier, function, goods_model, gross_weight, net_weight, length, width, height, volume, barcode, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_dtl + select id, in_serial_no, goods_code, goods_name, cargo_qty, abnormal_qty, out_qty, unit, weight, price, currency, nation_area, tax_no, hscode, brand, material, purpose, ingredients, manufacturer, supplier, function, goods_model, gross_weight, net_weight, length, width, height, volume, barcode, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_dtl - + + + - + + + + insert into emis_warehouse_in_dtl id, - in_no, - in_child_no, + in_serial_no, goods_code, goods_name, cargo_qty, @@ -139,11 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{id}, - #{inNo}, - #{inChildNo}, + #{inSerialNo}, #{goodsCode}, #{goodsName}, #{cargoQty}, @@ -181,14 +229,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + update emis_warehouse_in_dtl - in_no = #{inNo}, - in_child_no = #{inChildNo}, + in_serial_no = #{inSerialNo}, goods_code = #{goodsCode}, goods_name = #{goodsName}, cargo_qty = #{cargoQty}, @@ -235,7 +282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_warehouse_in_dtl where id in + delete from emis_warehouse_in_dtl where id in #{id}