From 61fa105bef3029be1d42218a259fdb8231b6a600 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 22 May 2024 08:24:16 +0800
Subject: [PATCH] md

---
 .../emis/EmisWarehouseInBatchController.java  | 118 ++++++++
 .../web/emis/EmisWarehouseInController.java   |  16 +-
 .../emis/EmisWarehouseInDtlController.java    | 118 ++++++++
 .../erp/emis/domain/EmisWarehouseIn.java      |  24 +-
 .../erp/emis/domain/EmisWarehouseInBatch.java |  71 +++++
 .../erp/emis/domain/EmisWarehouseInDtl.java   |  99 +++++++
 .../mapper/EmisWarehouseInBatchMapper.java    |  70 +++++
 .../emis/mapper/EmisWarehouseInDtlMapper.java |  70 +++++
 .../emis/mapper/EmisWarehouseInMapper.java    |   4 +-
 .../service/IEmisWarehouseInBatchService.java |  69 +++++
 .../service/IEmisWarehouseInDtlService.java   |  69 +++++
 .../emis/service/IEmisWarehouseInService.java |   4 +-
 .../impl/EmisWarehouseInBatchServiceImpl.java | 104 ++++++++
 .../impl/EmisWarehouseInDtlServiceImpl.java   | 104 ++++++++
 .../impl/EmisWarehouseInServiceImpl.java      |   4 +-
 .../mapper/EmisWarehouseInBatchMapper.xml     | 177 ++++++++++++
 .../mapper/EmisWarehouseInDtlMapper.xml       | 252 ++++++++++++++++++
 .../mapper/EmisWarehouseInMapper.xml          |  57 +++-
 18 files changed, 1391 insertions(+), 39 deletions(-)
 create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
 create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInDtlService.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
 create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInDtlServiceImpl.java
 create mode 100644 emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
 create mode 100644 emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
new file mode 100644
index 000000000..4f24d0d5c
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
@@ -0,0 +1,118 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisWarehouseInBatchController.java
+  * @author linfso
+  * @date 2024-05-22 00:20:32
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 进仓单批次 控制器 </p>
+ */
+
+package com.xdadan.erp.web.emis;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.StringUtils;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+
+import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
+import com.xdadan.erp.emis.service.IEmisWarehouseInBatchService;
+
+/**
+ * 进仓单批次Controller
+ * 
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+@RestController
+@RequestMapping("/emis/emisWarehouseInBatch")
+public class EmisWarehouseInBatchController extends BaseController
+{
+    @Autowired
+    private IEmisWarehouseInBatchService emisWarehouseInBatchService;
+
+    /**
+     * 查询进仓单批次列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInBatch:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        startPage();
+        List<EmisWarehouseInBatch> list = emisWarehouseInBatchService.selectEmisWarehouseInBatchList(emisWarehouseInBatch);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出进仓单批次列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInBatch:export')")
+    @Log(title = "进仓单批次", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        List<EmisWarehouseInBatch> list = emisWarehouseInBatchService.selectEmisWarehouseInBatchList(emisWarehouseInBatch);
+        ExcelUtil<EmisWarehouseInBatch> util = new ExcelUtil<EmisWarehouseInBatch>(EmisWarehouseInBatch.class);
+        util.exportExcel(response, list, "进仓单批次数据");
+    }
+
+    /**
+     * 获取进仓单批次详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInBatch:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(emisWarehouseInBatchService.selectEmisWarehouseInBatchById(id));
+    }
+
+    /**
+     * 新增进仓单批次
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInBatch:add')")
+    @Log(title = "进仓单批次", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        return toAjax(emisWarehouseInBatchService.insertEmisWarehouseInBatch(emisWarehouseInBatch));
+    }
+
+    /**
+     * 修改进仓单批次
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInBatch:edit')")
+    @Log(title = "进仓单批次", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        return toAjax(emisWarehouseInBatchService.updateEmisWarehouseInBatch(emisWarehouseInBatch));
+    }
+
+    /**
+     * 删除进仓单批次
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInBatch:remove')")
+    @Log(title = "进仓单批次", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emisWarehouseInBatchService.deleteEmisWarehouseInBatchByIds(ids));
+    }
+}
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java
index 934cbed61..67927449b 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInController.java
@@ -3,7 +3,7 @@
   * @Project: emis
   * @Title: EmisWarehouseInController.java
   * @author linfso
-  * @date 2024-04-27 06:13:46
+  * @date 2024-05-22 00:20:31
   * @Copyright: ShangHai Duta 2022 All rights reserved.
   * @version v1.0  
   * @Description: <p> 进仓单 控制器 </p>
@@ -13,9 +13,6 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
-
-import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
-import com.xdadan.erp.emis.domain.EmisTransProduct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,7 +39,7 @@ import com.xdadan.erp.emis.service.IEmisWarehouseInService;
  * 进仓单Controller
  * 
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  */
 @RestController
 @RequestMapping("/emis/emisWarehouseIn")
@@ -63,15 +60,6 @@ public class EmisWarehouseInController extends BaseController
         return getDataTable(list);
     }
 
-    @JacksonFilter(include= {"id","inNo","customerCode","customerName","superiorDate"},value= EmisWarehouseIn.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
-    @RequestMapping("/listSimple")
-    public TableDataInfo listSimple(EmisWarehouseIn emisWarehouseIn)
-    {
-        startPage();
-        List<EmisWarehouseIn> list = emisWarehouseInService.selectEmisWarehouseInList(emisWarehouseIn);
-        return getDataTable(list);
-    }
-
     /**
      * 导出进仓单列表
      */
diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java
new file mode 100644
index 000000000..4356f7993
--- /dev/null
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInDtlController.java
@@ -0,0 +1,118 @@
+
+/** 
+  * @Project: emis
+  * @Title: EmisWarehouseInDtlController.java
+  * @author linfso
+  * @date 2024-05-22 00:20:33
+  * @Copyright: ShangHai Duta 2022 All rights reserved.
+  * @version v1.0  
+  * @Description: <p> 进仓单明细 控制器 </p>
+ */
+
+package com.xdadan.erp.web.emis;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.xdadan.erp.common.annotation.Log;
+import com.xdadan.erp.common.core.controller.BaseController;
+import com.xdadan.erp.common.core.domain.AjaxResult;
+import com.xdadan.erp.common.core.page.TableDataInfo;
+import com.xdadan.erp.common.enums.BusinessType;
+import com.xdadan.erp.common.utils.StringUtils;
+import com.xdadan.erp.common.utils.poi.ExcelUtil;
+
+import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
+import com.xdadan.erp.emis.service.IEmisWarehouseInDtlService;
+
+/**
+ * 进仓单明细Controller
+ * 
+ * @author linfso
+ * @date 2024-05-22 00:20:33
+ */
+@RestController
+@RequestMapping("/emis/emisWarehouseInDtl")
+public class EmisWarehouseInDtlController extends BaseController
+{
+    @Autowired
+    private IEmisWarehouseInDtlService emisWarehouseInDtlService;
+
+    /**
+     * 查询进仓单明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInDtl:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(EmisWarehouseInDtl emisWarehouseInDtl)
+    {
+        startPage();
+        List<EmisWarehouseInDtl> list = emisWarehouseInDtlService.selectEmisWarehouseInDtlList(emisWarehouseInDtl);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出进仓单明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInDtl:export')")
+    @Log(title = "进仓单明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, EmisWarehouseInDtl emisWarehouseInDtl)
+    {
+        List<EmisWarehouseInDtl> list = emisWarehouseInDtlService.selectEmisWarehouseInDtlList(emisWarehouseInDtl);
+        ExcelUtil<EmisWarehouseInDtl> util = new ExcelUtil<EmisWarehouseInDtl>(EmisWarehouseInDtl.class);
+        util.exportExcel(response, list, "进仓单明细数据");
+    }
+
+    /**
+     * 获取进仓单明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInDtl:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(emisWarehouseInDtlService.selectEmisWarehouseInDtlById(id));
+    }
+
+    /**
+     * 新增进仓单明细
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInDtl:add')")
+    @Log(title = "进仓单明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody EmisWarehouseInDtl emisWarehouseInDtl)
+    {
+        return toAjax(emisWarehouseInDtlService.insertEmisWarehouseInDtl(emisWarehouseInDtl));
+    }
+
+    /**
+     * 修改进仓单明细
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInDtl:edit')")
+    @Log(title = "进仓单明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody EmisWarehouseInDtl emisWarehouseInDtl)
+    {
+        return toAjax(emisWarehouseInDtlService.updateEmisWarehouseInDtl(emisWarehouseInDtl));
+    }
+
+    /**
+     * 删除进仓单明细
+     */
+    @PreAuthorize("@ss.hasPermi('emis:emisWarehouseInDtl:remove')")
+    @Log(title = "进仓单明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(emisWarehouseInDtlService.deleteEmisWarehouseInDtlByIds(ids));
+    }
+}
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 5a5ab924e..357b0eb4b 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
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWarehouseIn.java
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0  
  * @Description: <p> 进仓单 实体类 </p>
@@ -26,7 +26,7 @@ import lombok.Data;
  * @ClassName EmisWarehouseIn
  * @Description 进仓单
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  */
  @Data
 public class EmisWarehouseIn extends BaseEntity
@@ -35,17 +35,29 @@ public class EmisWarehouseIn extends BaseEntity
 
     /* id */
     private Long id;
+    /* 进仓序列号 系统生成 */
+    private String serialNo;
     /* 进仓单号 */
     private String inNo;
+    /* 订单号 */
+    private String orderSn;
+    /* 运单号 */
+    private String billCode;
     /* 客户编号 */
     private String customerCode;
     /* 客户名称 */
     private String customerName;
     /* 进仓日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date superiorDate;
-    /* 序号 */
-    private String serialNumber;
-
+    private Date entryDate;
+    /* 客户确认状态 0-未确认 1-确认 2-部分确认3-异常反馈 */
+    private String confirmStatus;
+    /* 确认时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date confirmDate;
+    /* 占用状态 0-未占用 1-已全部占用 2-不分占用 */
+    private String usedStatus;
+    /* 状态 0-初始 */
+    private String status;
 
 }
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
new file mode 100644
index 000000000..752739f4b
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
@@ -0,0 +1,71 @@
+/** 
+ * @Project: emis
+ * @Title: EmisWarehouseInBatch.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单批次 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xdadan.erp.common.annotation.Excel;
+import com.xdadan.erp.common.core.domain.BaseEntity;
+import com.xdadan.erp.common.core.domain.TreeEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * @ClassName EmisWarehouseInBatch
+ * @Description 进仓单批次
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+ @Data
+public class EmisWarehouseInBatch extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 进仓序列号 系统生成 */
+    private String serialNo;
+    /* 进仓单号 */
+    private String inNo;
+    /* 进仓子批次单号in_no+001 002 */
+    private String inBatchNo;
+    /* 客户编号 */
+    private String customerCode;
+    /* 客户名称 */
+    private String customerName;
+    /* 订单号 */
+    private String orderSn;
+    /* 运单号 */
+    private String billCode;
+    /* 运输工具编号 例如车牌号等  */
+    private String transCarNo;
+    /* 进仓日期 */
+    @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")
+    private Date confirmDate;
+    /* 状态 */
+    private String status;
+    /* 总件数 */
+    private Integer totalParcelQty;
+    /* 总体积 */
+    private BigDecimal totalVolume;
+    /* 总重量 */
+    private BigDecimal totalWeight;
+
+}
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
new file mode 100644
index 000000000..739b14ec8
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInDtl.java
@@ -0,0 +1,99 @@
+/** 
+ * @Project: emis
+ * @Title: EmisWarehouseInDtl.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单明细 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.xdadan.erp.common.annotation.Excel;
+import com.xdadan.erp.common.core.domain.BaseEntity;
+import com.xdadan.erp.common.core.domain.TreeEntity;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * @ClassName EmisWarehouseInDtl
+ * @Description 进仓单明细
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+ @Data
+public class EmisWarehouseInDtl extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /* id */
+    private Long id;
+    /* 进仓主单号 */
+    private String inNo;
+    /* 进仓子单号 */
+    private String inChildNo;
+    /* 货物编码 */
+    private String goodsCode;
+    /* 货物名称 */
+    private String goodsName;
+    /* 实际数量 */
+    private Integer cargoQty;
+    /* 异常数量 */
+    private Integer abnormalQty;
+    /* 出库数量 */
+    private Integer outQty;
+    /* 单位 */
+    private String unit;
+    /* 重量 */
+    private BigDecimal weight;
+    /* 货物单价 */
+    private BigDecimal price;
+    /* 货物币种 */
+    private String currency;
+    /* 原产国 */
+    private String nationArea;
+    /* 行邮税号 */
+    private String taxNo;
+    /* 海关编码 */
+    private String hscode;
+    /* 品牌 */
+    private String brand;
+    /* 材质 */
+    private String material;
+    /* 用途 */
+    private String purpose;
+    /* 成分 */
+    private String ingredients;
+    /* 厂家 */
+    private String manufacturer;
+    /* 供应商 */
+    private String supplier;
+    /* 功能 */
+    private String function;
+    /* 规格型号 */
+    private String goodsModel;
+    /* 毛重 */
+    private BigDecimal grossWeight;
+    /* 净重 */
+    private BigDecimal netWeight;
+    /* 长 */
+    private BigDecimal length;
+    /* 宽 */
+    private BigDecimal width;
+    /* 高 */
+    private BigDecimal height;
+    /* 体积 */
+    private BigDecimal volume;
+    /* 条码 */
+    private String barcode;
+    /* 排序 */
+    private Integer orderNum;
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
new file mode 100644
index 000000000..7d6f3113c
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
@@ -0,0 +1,70 @@
+/** 
+ * @Project: emis
+ * @Title: EmisWarehouseInBatchMapper.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Doitinfo 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单批次 Mapper 接口 </p>
+ *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
+ */
+package com.xdadan.erp.emis.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
+/**
+ * @ClassName EmisWarehouseInBatchMapper
+ * @Description <p> 进仓单批次 Mapper 接口 </p>
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+public interface EmisWarehouseInBatchMapper extends BaseMapper<EmisWarehouseInBatch>
+{
+    /**
+     * 主键查询
+     * @param  id
+     * @return 
+     */
+    public EmisWarehouseInBatch selectEmisWarehouseInBatchById(Long id);
+
+    /**
+     * 查询列表
+     * 
+     * @param emisWarehouseInBatch 
+     * @return 集合
+     */
+    public List<EmisWarehouseInBatch> selectEmisWarehouseInBatchList(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    /**
+     * 新增 
+     * 
+     * @param emisWarehouseInBatch
+     * @return 
+     */
+    public int insertEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    /**
+     * 修改
+     * 
+     * @param emisWarehouseInBatch 
+     * @return 
+     */
+    public int updateEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    /**
+     * 删除
+     * 
+     * @param id 主键
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInBatchById(Long id);
+
+    /**
+     * 批量删除
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInBatchByIds(Long[] ids);
+}
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
new file mode 100644
index 000000000..4bd053879
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInDtlMapper.java
@@ -0,0 +1,70 @@
+/** 
+ * @Project: emis
+ * @Title: EmisWarehouseInDtlMapper.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Doitinfo 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单明细 Mapper 接口 </p>
+ *  <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
+ */
+package com.xdadan.erp.emis.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
+/**
+ * @ClassName EmisWarehouseInDtlMapper
+ * @Description <p> 进仓单明细 Mapper 接口 </p>
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+public interface EmisWarehouseInDtlMapper extends BaseMapper<EmisWarehouseInDtl>
+{
+    /**
+     * 主键查询
+     * @param  id
+     * @return 
+     */
+    public EmisWarehouseInDtl selectEmisWarehouseInDtlById(Long id);
+
+    /**
+     * 查询列表
+     * 
+     * @param emisWarehouseInDtl 
+     * @return 集合
+     */
+    public List<EmisWarehouseInDtl> selectEmisWarehouseInDtlList(EmisWarehouseInDtl emisWarehouseInDtl);
+
+    /**
+     * 新增 
+     * 
+     * @param emisWarehouseInDtl
+     * @return 
+     */
+    public int insertEmisWarehouseInDtl(EmisWarehouseInDtl emisWarehouseInDtl);
+
+    /**
+     * 修改
+     * 
+     * @param emisWarehouseInDtl 
+     * @return 
+     */
+    public int updateEmisWarehouseInDtl(EmisWarehouseInDtl emisWarehouseInDtl);
+
+    /**
+     * 删除
+     * 
+     * @param id 主键
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInDtlById(Long id);
+
+    /**
+     * 批量删除
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInDtlByIds(Long[] ids);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
index 0e9ba385a..f3e8eac28 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInMapper.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWarehouseInMapper.java
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  * @Copyright: ShangHai Doitinfo 2022 All rights reserved.
  * @version v1.0  
  * @Description: <p> 进仓单 Mapper 接口 </p>
@@ -17,7 +17,7 @@ import com.xdadan.erp.emis.domain.EmisWarehouseIn;
  * @ClassName EmisWarehouseInMapper
  * @Description <p> 进仓单 Mapper 接口 </p>
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  */
 public interface EmisWarehouseInMapper extends BaseMapper<EmisWarehouseIn>
 {
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
new file mode 100644
index 000000000..62e1cdc20
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
@@ -0,0 +1,69 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisWarehouseInBatchService.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单批次 服务类接口 </p>
+ */
+package com.xdadan.erp.emis.service;
+
+import java.util.List;
+import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
+
+/**
+ * @ClassName EmisWarehouseInBatchService
+ * @Description 进仓单批次
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+public interface IEmisWarehouseInBatchService 
+{
+   /**
+     * 主键查询
+     * @param id
+     * @return 
+     */
+    public EmisWarehouseInBatch selectEmisWarehouseInBatchById(Long id);
+
+    /**
+     * 查询进仓单批次列表
+     * 
+     * @param emisWarehouseInBatch 进仓单批次
+     * @return 进仓单批次集合
+     */
+    public List<EmisWarehouseInBatch> selectEmisWarehouseInBatchList(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    /**
+     * 新增进仓单批次
+     * 
+     * @param emisWarehouseInBatch 进仓单批次
+     * @return 结果
+     */
+    public int insertEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    /**
+     * 修改进仓单批次
+     * 
+     * @param emisWarehouseInBatch 进仓单批次
+     * @return 结果
+     */
+    public int updateEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
+
+    /**
+     * 批量删除进仓单批次
+     * 
+     * @param ids 需要删除的进仓单批次主键集合
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInBatchByIds(Long[] ids);
+
+    /**
+     * 删除进仓单批次信息
+     * 
+     * @param id 进仓单批次主键
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInBatchById(Long id);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInDtlService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInDtlService.java
new file mode 100644
index 000000000..550c7956f
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInDtlService.java
@@ -0,0 +1,69 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisWarehouseInDtlService.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单明细 服务类接口 </p>
+ */
+package com.xdadan.erp.emis.service;
+
+import java.util.List;
+import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
+
+/**
+ * @ClassName EmisWarehouseInDtlService
+ * @Description 进仓单明细
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+public interface IEmisWarehouseInDtlService 
+{
+   /**
+     * 主键查询
+     * @param id
+     * @return 
+     */
+    public EmisWarehouseInDtl selectEmisWarehouseInDtlById(Long id);
+
+    /**
+     * 查询进仓单明细列表
+     * 
+     * @param emisWarehouseInDtl 进仓单明细
+     * @return 进仓单明细集合
+     */
+    public List<EmisWarehouseInDtl> selectEmisWarehouseInDtlList(EmisWarehouseInDtl emisWarehouseInDtl);
+
+    /**
+     * 新增进仓单明细
+     * 
+     * @param emisWarehouseInDtl 进仓单明细
+     * @return 结果
+     */
+    public int insertEmisWarehouseInDtl(EmisWarehouseInDtl emisWarehouseInDtl);
+
+    /**
+     * 修改进仓单明细
+     * 
+     * @param emisWarehouseInDtl 进仓单明细
+     * @return 结果
+     */
+    public int updateEmisWarehouseInDtl(EmisWarehouseInDtl emisWarehouseInDtl);
+
+    /**
+     * 批量删除进仓单明细
+     * 
+     * @param ids 需要删除的进仓单明细主键集合
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInDtlByIds(Long[] ids);
+
+    /**
+     * 删除进仓单明细信息
+     * 
+     * @param id 进仓单明细主键
+     * @return 结果
+     */
+    public int deleteEmisWarehouseInDtlById(Long id);
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
index 85b2e1011..41fc70744 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInService.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWarehouseInService.java
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0  
  * @Description: <p> 进仓单 服务类接口 </p>
@@ -16,7 +16,7 @@ import com.xdadan.erp.emis.domain.EmisWarehouseIn;
  * @ClassName EmisWarehouseInService
  * @Description 进仓单
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  */
 public interface IEmisWarehouseInService 
 {
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
new file mode 100644
index 000000000..2c8a49ec8
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
@@ -0,0 +1,104 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisWarehouseInBatchServiceImpl.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单批次 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xdadan.erp.emis.domain.EmisWarehouseInBatch;
+import com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper;
+import com.xdadan.erp.emis.service.IEmisWarehouseInBatchService;
+
+/**
+ * 进仓单批次Service业务层处理
+ * 
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+@Service
+public class EmisWarehouseInBatchServiceImpl implements IEmisWarehouseInBatchService 
+{
+    @Autowired
+    private EmisWarehouseInBatchMapper emisWarehouseInBatchMapper;
+
+    /**
+     * 查询进仓单批次
+     * 
+     * @param id 进仓单批次主键
+     * @return 进仓单批次
+     */
+    @Override
+    public EmisWarehouseInBatch selectEmisWarehouseInBatchById(Long id)
+    {
+        return emisWarehouseInBatchMapper.selectEmisWarehouseInBatchById(id);
+    }
+
+    /**
+     * 查询进仓单批次列表
+     * 
+     * @param emisWarehouseInBatch 进仓单批次
+     * @return 进仓单批次
+     */
+    @Override
+    public List<EmisWarehouseInBatch> selectEmisWarehouseInBatchList(EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        return emisWarehouseInBatchMapper.selectEmisWarehouseInBatchList(emisWarehouseInBatch);
+    }
+
+    /**
+     * 新增进仓单批次
+     * 
+     * @param emisWarehouseInBatch 进仓单批次
+     * @return 结果
+     */
+    @Override
+    public int insertEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        return emisWarehouseInBatchMapper.insertEmisWarehouseInBatch(emisWarehouseInBatch);
+    }
+
+    /**
+     * 修改进仓单批次
+     * 
+     * @param emisWarehouseInBatch 进仓单批次
+     * @return 结果
+     */
+    @Override
+    public int updateEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch)
+    {
+        return emisWarehouseInBatchMapper.updateEmisWarehouseInBatch(emisWarehouseInBatch);
+    }
+
+    /**
+     * 批量删除进仓单批次
+     * 
+     * @param ids 需要删除的进仓单批次主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisWarehouseInBatchByIds(Long[] ids)
+    {
+        return emisWarehouseInBatchMapper.deleteEmisWarehouseInBatchByIds(ids);
+    }
+
+    /**
+     * 删除进仓单批次信息
+     * 
+     * @param id 进仓单批次主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisWarehouseInBatchById(Long id)
+    {
+        return emisWarehouseInBatchMapper.deleteEmisWarehouseInBatchById(id);
+    }
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInDtlServiceImpl.java
new file mode 100644
index 000000000..9399971f9
--- /dev/null
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInDtlServiceImpl.java
@@ -0,0 +1,104 @@
+ /** 
+ * @Project: emis
+ * @Title: EmisWarehouseInDtlServiceImpl.java
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ * @Copyright: ShangHai Duta 2022 All rights reserved.
+ * @version v1.0  
+ * @Description: <p> 进仓单明细 实体类 </p>
+ */
+
+package com.xdadan.erp.emis.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xdadan.erp.emis.domain.EmisWarehouseInDtl;
+import com.xdadan.erp.emis.mapper.EmisWarehouseInDtlMapper;
+import com.xdadan.erp.emis.service.IEmisWarehouseInDtlService;
+
+/**
+ * 进仓单明细Service业务层处理
+ * 
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+@Service
+public class EmisWarehouseInDtlServiceImpl implements IEmisWarehouseInDtlService 
+{
+    @Autowired
+    private EmisWarehouseInDtlMapper emisWarehouseInDtlMapper;
+
+    /**
+     * 查询进仓单明细
+     * 
+     * @param id 进仓单明细主键
+     * @return 进仓单明细
+     */
+    @Override
+    public EmisWarehouseInDtl selectEmisWarehouseInDtlById(Long id)
+    {
+        return emisWarehouseInDtlMapper.selectEmisWarehouseInDtlById(id);
+    }
+
+    /**
+     * 查询进仓单明细列表
+     * 
+     * @param emisWarehouseInDtl 进仓单明细
+     * @return 进仓单明细
+     */
+    @Override
+    public List<EmisWarehouseInDtl> selectEmisWarehouseInDtlList(EmisWarehouseInDtl emisWarehouseInDtl)
+    {
+        return emisWarehouseInDtlMapper.selectEmisWarehouseInDtlList(emisWarehouseInDtl);
+    }
+
+    /**
+     * 新增进仓单明细
+     * 
+     * @param emisWarehouseInDtl 进仓单明细
+     * @return 结果
+     */
+    @Override
+    public int insertEmisWarehouseInDtl(EmisWarehouseInDtl emisWarehouseInDtl)
+    {
+        return emisWarehouseInDtlMapper.insertEmisWarehouseInDtl(emisWarehouseInDtl);
+    }
+
+    /**
+     * 修改进仓单明细
+     * 
+     * @param emisWarehouseInDtl 进仓单明细
+     * @return 结果
+     */
+    @Override
+    public int updateEmisWarehouseInDtl(EmisWarehouseInDtl emisWarehouseInDtl)
+    {
+        return emisWarehouseInDtlMapper.updateEmisWarehouseInDtl(emisWarehouseInDtl);
+    }
+
+    /**
+     * 批量删除进仓单明细
+     * 
+     * @param ids 需要删除的进仓单明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisWarehouseInDtlByIds(Long[] ids)
+    {
+        return emisWarehouseInDtlMapper.deleteEmisWarehouseInDtlByIds(ids);
+    }
+
+    /**
+     * 删除进仓单明细信息
+     * 
+     * @param id 进仓单明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmisWarehouseInDtlById(Long id)
+    {
+        return emisWarehouseInDtlMapper.deleteEmisWarehouseInDtlById(id);
+    }
+
+}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
index ccc86c54a..efdeb3180 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInServiceImpl.java
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisWarehouseInServiceImpl.java
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0  
  * @Description: <p> 进仓单 实体类 </p>
@@ -21,7 +21,7 @@ import com.xdadan.erp.emis.service.IEmisWarehouseInService;
  * 进仓单Service业务层处理
  * 
  * @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
  */
 @Service
 public class EmisWarehouseInServiceImpl implements IEmisWarehouseInService 
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
new file mode 100644
index 000000000..be09656b0
--- /dev/null
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
@@ -0,0 +1,177 @@
+<?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">
+<mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInBatchMapper">
+    
+    <resultMap type="EmisWarehouseInBatch" id="EmisWarehouseInBatchResult">
+        <result property="id"    column="id"    />
+        <result property="serialNo"    column="serial_no"    />
+        <result property="inNo"    column="in_no"    />
+        <result property="inBatchNo"    column="in_batch_no"    />
+        <result property="customerCode"    column="customer_code"    />
+        <result property="customerName"    column="customer_name"    />
+        <result property="orderSn"    column="order_sn"    />
+        <result property="billCode"    column="bill_code"    />
+        <result property="transCarNo"    column="trans_car_no"    />
+        <result property="entryDate"    column="entry_date"    />
+        <result property="confirmStatus"    column="confirm_status"    />
+        <result property="confirmDate"    column="confirm_date"    />
+        <result property="status"    column="status"    />
+        <result property="totalParcelQty"    column="total_parcel_qty"    />
+        <result property="totalVolume"    column="total_volume"    />
+        <result property="totalWeight"    column="total_weight"    />
+        <result property="remark"    column="remark"    />
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
+    </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
+    </sql>
+
+    <select id="selectEmisWarehouseInBatchList" parameterType="EmisWarehouseInBatch" resultMap="EmisWarehouseInBatchResult">
+        <include refid="selectEmisWarehouseInBatchVo"/>
+        <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="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="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>
+            <if test="transCarNo != null  and transCarNo != ''"> and trans_car_no like concat('%', #{transCarNo}, '%')</if>
+            <if test="entryDate != null "> and entry_date = #{entryDate}</if>
+            <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="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="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>
+            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
+            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+        </where>
+        order by create_time desc
+    </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 
+        from emis_warehouse_in_batch a
+        where a.id = #{id}
+    </select>
+        
+    <insert id="insertEmisWarehouseInBatch" parameterType="EmisWarehouseInBatch" useGeneratedKeys="true" keyProperty="id">
+        insert into emis_warehouse_in_batch
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="serialNo != null and serialNo != ''">serial_no,</if>
+            <if test="inNo != null and inNo != ''">in_no,</if>
+            <if test="inBatchNo != null and inBatchNo != ''">in_batch_no,</if>
+            <if test="customerCode != null and customerCode != ''">customer_code,</if>
+            <if test="customerName != null and customerName != ''">customer_name,</if>
+            <if test="orderSn != null and orderSn != ''">order_sn,</if>
+            <if test="billCode != null and billCode != ''">bill_code,</if>
+            <if test="transCarNo != null and transCarNo != ''">trans_car_no,</if>
+            <if test="entryDate != null">entry_date,</if>
+            <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="totalParcelQty != null">total_parcel_qty,</if>
+            <if test="totalVolume != null">total_volume,</if>
+            <if test="totalWeight != null">total_weight,</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>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <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 prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="serialNo != null and serialNo != ''">#{serialNo},</if>
+            <if test="inNo != null and inNo != ''">#{inNo},</if>
+            <if test="inBatchNo != null and inBatchNo != ''">#{inBatchNo},</if>
+            <if test="customerCode != null and customerCode != ''">#{customerCode},</if>
+            <if test="customerName != null and customerName != ''">#{customerName},</if>
+            <if test="orderSn != null and orderSn != ''">#{orderSn},</if>
+            <if test="billCode != null and billCode != ''">#{billCode},</if>
+            <if test="transCarNo != null and transCarNo != ''">#{transCarNo},</if>
+            <if test="entryDate != null">#{entryDate},</if>
+            <if test="confirmStatus != null and confirmStatus != ''">#{confirmStatus},</if>
+            <if test="confirmDate != null">#{confirmDate},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="totalParcelQty != null">#{totalParcelQty},</if>
+            <if test="totalVolume != null">#{totalVolume},</if>
+            <if test="totalWeight != null">#{totalWeight},</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>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+         </trim>
+    </insert>
+
+    <update id="updateEmisWarehouseInBatch" parameterType="EmisWarehouseInBatch">
+        update emis_warehouse_in_batch
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="serialNo != null and serialNo != ''">serial_no = #{serialNo},</if>
+            <if test="inNo != null and inNo != ''">in_no = #{inNo},</if>
+            <if test="inBatchNo != null and inBatchNo != ''">in_batch_no = #{inBatchNo},</if>
+            <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
+            <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
+            <if test="orderSn != null and orderSn != ''">order_sn = #{orderSn},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
+            <if test="transCarNo != null and transCarNo != ''">trans_car_no = #{transCarNo},</if>
+            <if test="entryDate != null">entry_date = #{entryDate},</if>
+            <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="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="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>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmisWarehouseInBatchById" parameterType="Long">
+        delete from emis_warehouse_in_batch where id = #{id}
+    </delete>
+
+    <delete id="deleteEmisWarehouseInBatchByIds" parameterType="String">
+        delete from emis_warehouse_in_batch where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ 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
new file mode 100644
index 000000000..cd6774ece
--- /dev/null
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml
@@ -0,0 +1,252 @@
+<?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">
+<mapper namespace="com.xdadan.erp.emis.mapper.EmisWarehouseInDtlMapper">
+    
+    <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="goodsCode"    column="goods_code"    />
+        <result property="goodsName"    column="goods_name"    />
+        <result property="cargoQty"    column="cargo_qty"    />
+        <result property="abnormalQty"    column="abnormal_qty"    />
+        <result property="outQty"    column="out_qty"    />
+        <result property="unit"    column="unit"    />
+        <result property="weight"    column="weight"    />
+        <result property="price"    column="price"    />
+        <result property="currency"    column="currency"    />
+        <result property="nationArea"    column="nation_area"    />
+        <result property="taxNo"    column="tax_no"    />
+        <result property="hscode"    column="hscode"    />
+        <result property="brand"    column="brand"    />
+        <result property="material"    column="material"    />
+        <result property="purpose"    column="purpose"    />
+        <result property="ingredients"    column="ingredients"    />
+        <result property="manufacturer"    column="manufacturer"    />
+        <result property="supplier"    column="supplier"    />
+        <result property="function"    column="function"    />
+        <result property="goodsModel"    column="goods_model"    />
+        <result property="grossWeight"    column="gross_weight"    />
+        <result property="netWeight"    column="net_weight"    />
+        <result property="length"    column="length"    />
+        <result property="width"    column="width"    />
+        <result property="height"    column="height"    />
+        <result property="volume"    column="volume"    />
+        <result property="barcode"    column="barcode"    />
+        <result property="orderNum"    column="order_num"    />
+        <result property="remark"    column="remark"    />
+        <result property="tenantId"    column="tenant_id"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createSite"    column="create_site"    />
+        <result property="updateSite"    column="update_site"    />
+    </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
+    </sql>
+
+    <select id="selectEmisWarehouseInDtlList" parameterType="EmisWarehouseInDtl" resultMap="EmisWarehouseInDtlResult">
+        <include refid="selectEmisWarehouseInDtlVo"/>
+        <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="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>
+            <if test="abnormalQty != null "> and abnormal_qty = #{abnormalQty}</if>
+            <if test="outQty != null "> and out_qty = #{outQty}</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="weight != null "> and weight = #{weight}</if>
+            <if test="price != null "> and price = #{price}</if>
+            <if test="currency != null  and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
+            <if test="nationArea != null  and nationArea != ''"> and nation_area like concat('%', #{nationArea}, '%')</if>
+            <if test="taxNo != null  and taxNo != ''"> and tax_no like concat('%', #{taxNo}, '%')</if>
+            <if test="hscode != null  and hscode != ''"> and hscode like concat('%', #{hscode}, '%')</if>
+            <if test="brand != null  and brand != ''"> and brand like concat('%', #{brand}, '%')</if>
+            <if test="material != null  and material != ''"> and material like concat('%', #{material}, '%')</if>
+            <if test="purpose != null  and purpose != ''"> and purpose like concat('%', #{purpose}, '%')</if>
+            <if test="ingredients != null  and ingredients != ''"> and ingredients like concat('%', #{ingredients}, '%')</if>
+            <if test="manufacturer != null  and manufacturer != ''"> and manufacturer like concat('%', #{manufacturer}, '%')</if>
+            <if test="supplier != null  and supplier != ''"> and supplier like concat('%', #{supplier}, '%')</if>
+            <if test="function != null  and function != ''"> and function like concat('%', #{function}, '%')</if>
+            <if test="goodsModel != null  and goodsModel != ''"> and goods_model like concat('%', #{goodsModel}, '%')</if>
+            <if test="grossWeight != null "> and gross_weight = #{grossWeight}</if>
+            <if test="netWeight != null "> and net_weight = #{netWeight}</if>
+            <if test="length != null "> and length = #{length}</if>
+            <if test="width != null "> and width = #{width}</if>
+            <if test="height != null "> and height = #{height}</if>
+            <if test="volume != null "> and volume = #{volume}</if>
+            <if test="barcode != null  and barcode != ''"> and barcode like concat('%', #{barcode}, '%')</if>
+            <if test="orderNum != null "> and order_num = #{orderNum}</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>
+            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
+            <if test="updateTime != null "> and update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+        </where>
+        order by create_time desc
+    </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 
+        from emis_warehouse_in_dtl a
+        where a.id = #{id}
+    </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="goodsCode != null and goodsCode != ''">goods_code,</if>
+            <if test="goodsName != null and goodsName != ''">goods_name,</if>
+            <if test="cargoQty != null">cargo_qty,</if>
+            <if test="abnormalQty != null">abnormal_qty,</if>
+            <if test="outQty != null">out_qty,</if>
+            <if test="unit != null and unit != ''">unit,</if>
+            <if test="weight != null">weight,</if>
+            <if test="price != null">price,</if>
+            <if test="currency != null and currency != ''">currency,</if>
+            <if test="nationArea != null and nationArea != ''">nation_area,</if>
+            <if test="taxNo != null and taxNo != ''">tax_no,</if>
+            <if test="hscode != null and hscode != ''">hscode,</if>
+            <if test="brand != null and brand != ''">brand,</if>
+            <if test="material != null and material != ''">material,</if>
+            <if test="purpose != null and purpose != ''">purpose,</if>
+            <if test="ingredients != null and ingredients != ''">ingredients,</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer,</if>
+            <if test="supplier != null and supplier != ''">supplier,</if>
+            <if test="function != null and function != ''">function,</if>
+            <if test="goodsModel != null and goodsModel != ''">goods_model,</if>
+            <if test="grossWeight != null">gross_weight,</if>
+            <if test="netWeight != null">net_weight,</if>
+            <if test="length != null">length,</if>
+            <if test="width != null">width,</if>
+            <if test="height != null">height,</if>
+            <if test="volume != null">volume,</if>
+            <if test="barcode != null and barcode != ''">barcode,</if>
+            <if test="orderNum != null">order_num,</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>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <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 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="goodsCode != null and goodsCode != ''">#{goodsCode},</if>
+            <if test="goodsName != null and goodsName != ''">#{goodsName},</if>
+            <if test="cargoQty != null">#{cargoQty},</if>
+            <if test="abnormalQty != null">#{abnormalQty},</if>
+            <if test="outQty != null">#{outQty},</if>
+            <if test="unit != null and unit != ''">#{unit},</if>
+            <if test="weight != null">#{weight},</if>
+            <if test="price != null">#{price},</if>
+            <if test="currency != null and currency != ''">#{currency},</if>
+            <if test="nationArea != null and nationArea != ''">#{nationArea},</if>
+            <if test="taxNo != null and taxNo != ''">#{taxNo},</if>
+            <if test="hscode != null and hscode != ''">#{hscode},</if>
+            <if test="brand != null and brand != ''">#{brand},</if>
+            <if test="material != null and material != ''">#{material},</if>
+            <if test="purpose != null and purpose != ''">#{purpose},</if>
+            <if test="ingredients != null and ingredients != ''">#{ingredients},</if>
+            <if test="manufacturer != null and manufacturer != ''">#{manufacturer},</if>
+            <if test="supplier != null and supplier != ''">#{supplier},</if>
+            <if test="function != null and function != ''">#{function},</if>
+            <if test="goodsModel != null and goodsModel != ''">#{goodsModel},</if>
+            <if test="grossWeight != null">#{grossWeight},</if>
+            <if test="netWeight != null">#{netWeight},</if>
+            <if test="length != null">#{length},</if>
+            <if test="width != null">#{width},</if>
+            <if test="height != null">#{height},</if>
+            <if test="volume != null">#{volume},</if>
+            <if test="barcode != null and barcode != ''">#{barcode},</if>
+            <if test="orderNum != null">#{orderNum},</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>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createSite != null and createSite != ''">#{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">#{updateSite},</if>
+         </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="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>
+            <if test="abnormalQty != null">abnormal_qty = #{abnormalQty},</if>
+            <if test="outQty != null">out_qty = #{outQty},</if>
+            <if test="unit != null and unit != ''">unit = #{unit},</if>
+            <if test="weight != null">weight = #{weight},</if>
+            <if test="price != null">price = #{price},</if>
+            <if test="currency != null and currency != ''">currency = #{currency},</if>
+            <if test="nationArea != null and nationArea != ''">nation_area = #{nationArea},</if>
+            <if test="taxNo != null and taxNo != ''">tax_no = #{taxNo},</if>
+            <if test="hscode != null and hscode != ''">hscode = #{hscode},</if>
+            <if test="brand != null and brand != ''">brand = #{brand},</if>
+            <if test="material != null and material != ''">material = #{material},</if>
+            <if test="purpose != null and purpose != ''">purpose = #{purpose},</if>
+            <if test="ingredients != null and ingredients != ''">ingredients = #{ingredients},</if>
+            <if test="manufacturer != null and manufacturer != ''">manufacturer = #{manufacturer},</if>
+            <if test="supplier != null and supplier != ''">supplier = #{supplier},</if>
+            <if test="function != null and function != ''">function = #{function},</if>
+            <if test="goodsModel != null and goodsModel != ''">goods_model = #{goodsModel},</if>
+            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
+            <if test="netWeight != null">net_weight = #{netWeight},</if>
+            <if test="length != null">length = #{length},</if>
+            <if test="width != null">width = #{width},</if>
+            <if test="height != null">height = #{height},</if>
+            <if test="volume != null">volume = #{volume},</if>
+            <if test="barcode != null and barcode != ''">barcode = #{barcode},</if>
+            <if test="orderNum != null">order_num = #{orderNum},</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>
+            <if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
+            <if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteEmisWarehouseInDtlById" parameterType="Long">
+        delete from emis_warehouse_in_dtl where id = #{id}
+    </delete>
+
+    <delete id="deleteEmisWarehouseInDtlByIds" parameterType="String">
+        delete from emis_warehouse_in_dtl where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index a6a743c5b..4467e82a3 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -6,11 +6,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="EmisWarehouseIn" id="EmisWarehouseInResult">
         <result property="id"    column="id"    />
+        <result property="serialNo"    column="serial_no"    />
         <result property="inNo"    column="in_no"    />
+        <result property="orderSn"    column="order_sn"    />
+        <result property="billCode"    column="bill_code"    />
         <result property="customerCode"    column="customer_code"    />
         <result property="customerName"    column="customer_name"    />
-        <result property="superiorDate"    column="superior_date"    />
-        <result property="serialNumber"    column="serial_number"    />
+        <result property="entryDate"    column="entry_date"    />
+        <result property="confirmStatus"    column="confirm_status"    />
+        <result property="confirmDate"    column="confirm_date"    />
+        <result property="usedStatus"    column="used_status"    />
+        <result property="status"    column="status"    />
         <result property="remark"    column="remark"    />
         <result property="tenantId"    column="tenant_id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -23,18 +29,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisWarehouseInVo">
-        select id, in_no, customer_code, customer_name, superior_date, serial_number, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in
+        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in
     </sql>
 
     <select id="selectEmisWarehouseInList" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult">
         <include refid="selectEmisWarehouseInVo"/>
         <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="orderSn != null  and orderSn != ''"> and order_sn like concat('%', #{orderSn}, '%')</if>
+            <if test="billCode != null  and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
             <if test="customerCode != null  and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="superiorDate != null "> and superior_date = #{superiorDate}</if>
-            <if test="serialNumber != null  and serialNumber != ''"> and serial_number like concat('%', #{serialNumber}, '%')</if>
+            <if test="entryDate != null "> and entry_date = #{entryDate}</if>
+            <if test="confirmStatus != null  and confirmStatus != ''"> and confirm_status like concat('%', #{confirmStatus}, '%')</if>
+            <if test="confirmDate != null "> and confirm_date = #{confirmDate}</if>
+            <if test="usedStatus != null  and usedStatus != ''"> and used_status like concat('%', #{usedStatus}, '%')</if>
+            <if test="status != null  and status != ''"> and status like concat('%', #{status}, '%')</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>
@@ -49,20 +62,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
   
     <select id="selectEmisWarehouseInById" parameterType="Long" resultMap="EmisWarehouseInResult">
-        select id, in_no, customer_code, customer_name, superior_date, serial_number, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
+        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
         from emis_warehouse_in a
         where a.id = #{id}
     </select>
         
-    <insert id="insertEmisWarehouseIn" parameterType="EmisWarehouseIn">
+    <insert id="insertEmisWarehouseIn" parameterType="EmisWarehouseIn" useGeneratedKeys="true" keyProperty="id">
         insert into emis_warehouse_in
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="serialNo != null and serialNo != ''">serial_no,</if>
             <if test="inNo != null and inNo != ''">in_no,</if>
+            <if test="orderSn != null and orderSn != ''">order_sn,</if>
+            <if test="billCode != null and billCode != ''">bill_code,</if>
             <if test="customerCode != null and customerCode != ''">customer_code,</if>
             <if test="customerName != null and customerName != ''">customer_name,</if>
-            <if test="superiorDate != null">superior_date,</if>
-            <if test="serialNumber != null and serialNumber != ''">serial_number,</if>
+            <if test="entryDate != null">entry_date,</if>
+            <if test="confirmStatus != null and confirmStatus != ''">confirm_status,</if>
+            <if test="confirmDate != null">confirm_date,</if>
+            <if test="usedStatus != null and usedStatus != ''">used_status,</if>
+            <if test="status != null and status != ''">status,</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>
@@ -75,11 +94,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="serialNo != null and serialNo != ''">#{serialNo},</if>
             <if test="inNo != null and inNo != ''">#{inNo},</if>
+            <if test="orderSn != null and orderSn != ''">#{orderSn},</if>
+            <if test="billCode != null and billCode != ''">#{billCode},</if>
             <if test="customerCode != null and customerCode != ''">#{customerCode},</if>
             <if test="customerName != null and customerName != ''">#{customerName},</if>
-            <if test="superiorDate != null">#{superiorDate},</if>
-            <if test="serialNumber != null and serialNumber != ''">#{serialNumber},</if>
+            <if test="entryDate != null">#{entryDate},</if>
+            <if test="confirmStatus != null and confirmStatus != ''">#{confirmStatus},</if>
+            <if test="confirmDate != null">#{confirmDate},</if>
+            <if test="usedStatus != null and usedStatus != ''">#{usedStatus},</if>
+            <if test="status != null and status != ''">#{status},</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>
@@ -95,11 +120,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateEmisWarehouseIn" parameterType="EmisWarehouseIn">
         update emis_warehouse_in
         <trim prefix="SET" suffixOverrides=",">
+            <if test="serialNo != null and serialNo != ''">serial_no = #{serialNo},</if>
             <if test="inNo != null and inNo != ''">in_no = #{inNo},</if>
+            <if test="orderSn != null and orderSn != ''">order_sn = #{orderSn},</if>
+            <if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
             <if test="customerCode != null and customerCode != ''">customer_code = #{customerCode},</if>
             <if test="customerName != null and customerName != ''">customer_name = #{customerName},</if>
-            <if test="superiorDate != null">superior_date = #{superiorDate},</if>
-            <if test="serialNumber != null and serialNumber != ''">serial_number = #{serialNumber},</if>
+            <if test="entryDate != null">entry_date = #{entryDate},</if>
+            <if test="confirmStatus != null and confirmStatus != ''">confirm_status = #{confirmStatus},</if>
+            <if test="confirmDate != null">confirm_date = #{confirmDate},</if>
+            <if test="usedStatus != null and usedStatus != ''">used_status = #{usedStatus},</if>
+            <if test="status != null and status != ''">status = #{status},</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>