aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-09-01 17:03:54 +08:00
parent 0afdcb1bd4
commit f649526110
6 changed files with 175 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseIn.java
View File

@ -64,6 +64,8 @@ public class EmisWarehouseIn extends BaseEntity
// 扩展参数
private EmisWaybill waybillDetail;
// 入仓批次信息
private List<EmisWarehouseInBatch> stockInBatchList;

32
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
View File

@ -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<EmisWarehouseInDtl> cargoList;
}

6
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java
View File

@ -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;
/* 货物名称 */

3
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java
View File

@ -36,6 +36,9 @@ public interface EmisWarehouseInDtlMapper extends BaseMapper<EmisWarehouseInDtl>
*/
public List<EmisWarehouseInDtl> selectEmisWarehouseInDtlList(EmisWarehouseInDtl emisWarehouseInDtl);
public List<EmisWarehouseInDtl> selectWarehouseInDtlListBySerialNo(String inSerialNo);
/**
* 新增
*

88
emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
View File

@ -18,25 +18,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="confirmStatus" column="confirm_status" />
<result property="confirmDate" column="confirm_date" />
<result property="status" column="status" />
<result property="blPrepareInFreight" column="bl_prepare_in_freight" />
<result property="prepareInEstFee" column="prepare_in_est_fee" />
<result property="prepareInRealFee" column="prepare_in_real_fee" />
<result property="prepareInExpress" column="prepare_in_express" />
<result property="prepareInBillCode" column="prepare_in_bill_code" />
<result property="prepareInRemark" column="prepare_in_remark" />
<result property="prepareInSupplier" column="prepare_in_supplier" />
<result property="packType" column="pack_type" />
<result property="totalParcelQty" column="total_parcel_qty" />
<result property="totalVolume" column="total_volume" />
<result property="totalWeight" column="total_weight" />
<result property="picUrl" column="pic_url" />
<association property="cargoList"
column="serial_no"
select="com.xdadan.erp.emis.mapper.EmisWarehouseInDtlMapper.selectWarehouseInDtlListBySerialNo"
fetchType="lazy"
/>
</resultMap>
<sql id="selectEmisWarehouseInBatchVo">
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
</sql>
<select id="selectEmisWarehouseInBatchList" parameterType="EmisWarehouseInBatch" resultMap="EmisWarehouseInBatchResult">
<include refid="selectEmisWarehouseInBatchVo"/>
<where>
del_flag='0'
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="serialNo != null and serialNo != ''"> and serial_no like concat('%', #{serialNo}, '%')</if>
<if test="inNo != null and inNo != ''"> and in_no like concat('%', #{inNo}, '%')</if>
<if test="serialNo != null and serialNo != ''"> and serial_no=#{serialNo}</if>
<if test="inNo != null and inNo != ''"> and in_no=#{inNo}</if>
<if test="inBatchNo != null and inBatchNo != ''"> and in_batch_no like concat('%', #{inBatchNo}, '%')</if>
<if test="customerCode != null and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
<if test="customerCode != null and customerCode != ''"> and customer_code=#{customerCode}</if>
<if test="customerName != null and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
<if test="orderSn != null and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
<if test="billCode != null and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
@ -45,9 +60,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="confirmStatus != null and confirmStatus != ''"> and confirm_status like concat('%', #{confirmStatus}, '%')</if>
<if test="confirmDate != null "> and confirm_date = #{confirmDate}</if>
<if test="status != null and status != ''"> and status like concat('%', #{status}, '%')</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''"> and bl_prepare_in_freight like concat('%', #{blPrepareInFreight}, '%')</if>
<if test="prepareInEstFee != null "> and prepare_in_est_fee = #{prepareInEstFee}</if>
<if test="prepareInRealFee != null "> and prepare_in_real_fee = #{prepareInRealFee}</if>
<if test="prepareInExpress != null and prepareInExpress != ''"> and prepare_in_express like concat('%', #{prepareInExpress}, '%')</if>
<if test="prepareInBillCode != null and prepareInBillCode != ''"> and prepare_in_bill_code like concat('%', #{prepareInBillCode}, '%')</if>
<if test="prepareInRemark != null and prepareInRemark != ''"> and prepare_in_remark like concat('%', #{prepareInRemark}, '%')</if>
<if test="prepareInSupplier != null and prepareInSupplier != ''"> and prepare_in_supplier like concat('%', #{prepareInSupplier}, '%')</if>
<if test="packType != null and packType != ''"> and pack_type like concat('%', #{packType}, '%')</if>
<if test="totalParcelQty != null "> and total_parcel_qty = #{totalParcelQty}</if>
<if test="totalVolume != null "> and total_volume = #{totalVolume}</if>
<if test="totalWeight != null "> and total_weight = #{totalWeight}</if>
<if test="picUrl != null and picUrl != ''"> and pic_url like concat('%', #{picUrl}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@ -61,19 +85,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc
</select>
<select id="selectStockInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
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 a
where a.in_no = #{inNo}
</select>
<select id="selectEmisWarehouseInBatchById" parameterType="Long" resultMap="EmisWarehouseInBatchResult">
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
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 a
where a.id = #{id}
</select>
<select id="selectStockInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
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 a
where del_flag='0' and a.in_no = #{inNo}
</select>
<insert id="insertEmisWarehouseInBatch" parameterType="EmisWarehouseInBatch" useGeneratedKeys="true" keyProperty="id">
insert into emis_warehouse_in_batch
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -90,9 +113,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="confirmStatus != null and confirmStatus != ''">confirm_status,</if>
<if test="confirmDate != null">confirm_date,</if>
<if test="status != null and status != ''">status,</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''">bl_prepare_in_freight,</if>
<if test="prepareInEstFee != null">prepare_in_est_fee,</if>
<if test="prepareInRealFee != null">prepare_in_real_fee,</if>
<if test="prepareInExpress != null and prepareInExpress != ''">prepare_in_express,</if>
<if test="prepareInBillCode != null and prepareInBillCode != ''">prepare_in_bill_code,</if>
<if test="prepareInRemark != null and prepareInRemark != ''">prepare_in_remark,</if>
<if test="prepareInSupplier != null and prepareInSupplier != ''">prepare_in_supplier,</if>
<if test="packType != null and packType != ''">pack_type,</if>
<if test="totalParcelQty != null">total_parcel_qty,</if>
<if test="totalVolume != null">total_volume,</if>
<if test="totalWeight != null">total_weight,</if>
<if test="picUrl != null and picUrl != ''">pic_url,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
@ -102,7 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="serialNo != null and serialNo != ''">#{serialNo},</if>
@ -117,9 +149,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="confirmStatus != null and confirmStatus != ''">#{confirmStatus},</if>
<if test="confirmDate != null">#{confirmDate},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''">#{blPrepareInFreight},</if>
<if test="prepareInEstFee != null">#{prepareInEstFee},</if>
<if test="prepareInRealFee != null">#{prepareInRealFee},</if>
<if test="prepareInExpress != null and prepareInExpress != ''">#{prepareInExpress},</if>
<if test="prepareInBillCode != null and prepareInBillCode != ''">#{prepareInBillCode},</if>
<if test="prepareInRemark != null and prepareInRemark != ''">#{prepareInRemark},</if>
<if test="prepareInSupplier != null and prepareInSupplier != ''">#{prepareInSupplier},</if>
<if test="packType != null and packType != ''">#{packType},</if>
<if test="totalParcelQty != null">#{totalParcelQty},</if>
<if test="totalVolume != null">#{totalVolume},</if>
<if test="totalWeight != null">#{totalWeight},</if>
<if test="picUrl != null and picUrl != ''">#{picUrl},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@ -129,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</trim>
</insert>
<update id="updateEmisWarehouseInBatch" parameterType="EmisWarehouseInBatch">
@ -147,9 +188,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="confirmStatus != null and confirmStatus != ''">confirm_status = #{confirmStatus},</if>
<if test="confirmDate != null">confirm_date = #{confirmDate},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''">bl_prepare_in_freight = #{blPrepareInFreight},</if>
<if test="prepareInEstFee != null">prepare_in_est_fee = #{prepareInEstFee},</if>
<if test="prepareInRealFee != null">prepare_in_real_fee = #{prepareInRealFee},</if>
<if test="prepareInExpress != null and prepareInExpress != ''">prepare_in_express = #{prepareInExpress},</if>
<if test="prepareInBillCode != null and prepareInBillCode != ''">prepare_in_bill_code = #{prepareInBillCode},</if>
<if test="prepareInRemark != null and prepareInRemark != ''">prepare_in_remark = #{prepareInRemark},</if>
<if test="prepareInSupplier != null and prepareInSupplier != ''">prepare_in_supplier = #{prepareInSupplier},</if>
<if test="packType != null and packType != ''">pack_type = #{packType},</if>
<if test="totalParcelQty != null">total_parcel_qty = #{totalParcelQty},</if>
<if test="totalVolume != null">total_volume = #{totalVolume},</if>
<if test="totalWeight != null">total_weight = #{totalWeight},</if>
<if test="picUrl != null and picUrl != ''">pic_url = #{picUrl},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
@ -168,9 +218,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteEmisWarehouseInBatchByIds" parameterType="String">
delete from emis_warehouse_in_batch where id in
delete from emis_warehouse_in_batch where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

93
emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml
View File

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInDtlMapper">
<resultMap type="EmisWarehouseInDtl" id="EmisWarehouseInDtlResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
<resultMap type="EmisWarehouseInDtl" id="EmisWarehouseInDtlResult">
<result property="id" column="id" />
<result property="inNo" column="in_no" />
<result property="inChildNo" column="in_child_no" />
<result property="inSerialNo" column="in_serial_no" />
<result property="goodsCode" column="goods_code" />
<result property="goodsName" column="goods_name" />
<result property="cargoQty" column="cargo_qty" />
@ -39,16 +38,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEmisWarehouseInDtlVo">
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
</sql>
<select id="selectEmisWarehouseInDtlList" parameterType="EmisWarehouseInDtl" resultMap="EmisWarehouseInDtlResult">
<include refid="selectEmisWarehouseInDtlVo"/>
<where>
del_flag='0'
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="inNo != null and inNo != ''"> and in_no like concat('%', #{inNo}, '%')</if>
<if test="inChildNo != null and inChildNo != ''"> and in_child_no like concat('%', #{inChildNo}, '%')</if>
<if test="inSerialNo != null and inSerialNo != ''"> and in_serial_no like concat('%', #{inSerialNo}, '%')</if>
<if test="goodsCode != null and goodsCode != ''"> and goods_code like concat('%', #{goodsCode}, '%')</if>
<if test="goodsName != null and goodsName != ''"> and goods_name like concat('%', #{goodsName}, '%')</if>
<if test="cargoQty != null "> and cargo_qty = #{cargoQty}</if>
@ -89,19 +87,70 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
order by create_time desc
</select>
<select id="checkUnique" parameterType="EmisWarehouseInDtl" resultType="int">
select count(1) from emis_warehouse_in_dtl
where del_flag='0'
and id = #{id}
and in_serial_no = #{inSerialNo}
and goods_code = #{goodsCode}
and goods_name = #{goodsName}
and cargo_qty = #{cargoQty}
and abnormal_qty = #{abnormalQty}
and out_qty = #{outQty}
and unit = #{unit}
and weight = #{weight}
and price = #{price}
and currency = #{currency}
and nation_area = #{nationArea}
and tax_no = #{taxNo}
and hscode = #{hscode}
and brand = #{brand}
and material = #{material}
and purpose = #{purpose}
and ingredients = #{ingredients}
and manufacturer = #{manufacturer}
and supplier = #{supplier}
and function = #{function}
and goods_model = #{goodsModel}
and gross_weight = #{grossWeight}
and net_weight = #{netWeight}
and length = #{length}
and width = #{width}
and height = #{height}
and volume = #{volume}
and barcode = #{barcode}
and order_num = #{orderNum}
and remark = #{remark}
and tenant_id = #{tenantId}
and del_flag = #{delFlag}
and create_by = #{createBy}
and create_time = #{createTime}
and update_by = #{updateBy}
and update_time = #{updateTime}
and create_site = #{createSite}
and update_site = #{updateSite}
limit 1
</select>
<select id="selectEmisWarehouseInDtlById" parameterType="Long" resultMap="EmisWarehouseInDtlResult">
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
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 a
where a.id = #{id}
</select>
<select id="selectWarehouseInDtlListBySerialNo" parameterType="String" resultMap="EmisWarehouseInDtlResult">
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 a
where del_flag='0' and a.in_serial_no = #{inSerialNo}
</select>
<insert id="insertEmisWarehouseInDtl" parameterType="EmisWarehouseInDtl" useGeneratedKeys="true" keyProperty="id">
insert into emis_warehouse_in_dtl
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="inNo != null and inNo != ''">in_no,</if>
<if test="inChildNo != null and inChildNo != ''">in_child_no,</if>
<if test="inSerialNo != null and inSerialNo != ''">in_serial_no,</if>
<if test="goodsCode != null and goodsCode != ''">goods_code,</if>
<if test="goodsName != null and goodsName != ''">goods_name,</if>
<if test="cargoQty != null">cargo_qty,</if>
@ -139,11 +188,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="inNo != null and inNo != ''">#{inNo},</if>
<if test="inChildNo != null and inChildNo != ''">#{inChildNo},</if>
<if test="inSerialNo != null and inSerialNo != ''">#{inSerialNo},</if>
<if test="goodsCode != null and goodsCode != ''">#{goodsCode},</if>
<if test="goodsName != null and goodsName != ''">#{goodsName},</if>
<if test="cargoQty != null">#{cargoQty},</if>
@ -181,14 +229,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</trim>
</insert>
<update id="updateEmisWarehouseInDtl" parameterType="EmisWarehouseInDtl">
update emis_warehouse_in_dtl
<trim prefix="SET" suffixOverrides=",">
<if test="inNo != null and inNo != ''">in_no = #{inNo},</if>
<if test="inChildNo != null and inChildNo != ''">in_child_no = #{inChildNo},</if>
<if test="inSerialNo != null and inSerialNo != ''">in_serial_no = #{inSerialNo},</if>
<if test="goodsCode != null and goodsCode != ''">goods_code = #{goodsCode},</if>
<if test="goodsName != null and goodsName != ''">goods_name = #{goodsName},</if>
<if test="cargoQty != null">cargo_qty = #{cargoQty},</if>
@ -235,7 +282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteEmisWarehouseInDtlByIds" parameterType="String">
delete from emis_warehouse_in_dtl where id in
delete from emis_warehouse_in_dtl where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>