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: 进仓单批次 控制器
+ */
+
+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 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 list = emisWarehouseInBatchService.selectEmisWarehouseInBatchList(emisWarehouseInBatch);
+ ExcelUtil util = new ExcelUtil(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: 进仓单 控制器
@@ -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 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: 进仓单明细 控制器
+ */
+
+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 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 list = emisWarehouseInDtlService.selectEmisWarehouseInDtlList(emisWarehouseInDtl);
+ ExcelUtil util = new ExcelUtil(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: 进仓单 实体类
@@ -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: 进仓单批次 实体类
+ */
+
+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: 进仓单明细 实体类
+ */
+
+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: 进仓单批次 Mapper 接口
+ * Warning : This file is generate by ai tools,don't edit!!!
+ */
+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 进仓单批次 Mapper 接口
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+public interface EmisWarehouseInBatchMapper extends BaseMapper
+{
+ /**
+ * 主键查询
+ * @param id
+ * @return
+ */
+ public EmisWarehouseInBatch selectEmisWarehouseInBatchById(Long id);
+
+ /**
+ * 查询列表
+ *
+ * @param emisWarehouseInBatch
+ * @return 集合
+ */
+ public List 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: 进仓单明细 Mapper 接口
+ * Warning : This file is generate by ai tools,don't edit!!!
+ */
+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 进仓单明细 Mapper 接口
+ * @author linfso
+ * @date 2024-05-22 00:20:32
+ */
+public interface EmisWarehouseInDtlMapper extends BaseMapper
+{
+ /**
+ * 主键查询
+ * @param id
+ * @return
+ */
+ public EmisWarehouseInDtl selectEmisWarehouseInDtlById(Long id);
+
+ /**
+ * 查询列表
+ *
+ * @param emisWarehouseInDtl
+ * @return 集合
+ */
+ public List 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: 进仓单 Mapper 接口
@@ -17,7 +17,7 @@ import com.xdadan.erp.emis.domain.EmisWarehouseIn;
* @ClassName EmisWarehouseInMapper
* @Description 进仓单 Mapper 接口
* @author linfso
- * @date 2024-04-27 06:13:46
+ * @date 2024-05-22 00:20:31
*/
public interface EmisWarehouseInMapper extends BaseMapper
{
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: 进仓单批次 服务类接口
+ */
+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 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: 进仓单明细 服务类接口
+ */
+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 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: 进仓单 服务类接口
@@ -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: 进仓单批次 实体类
+ */
+
+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 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: 进仓单明细 实体类
+ */
+
+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 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: 进仓单 实体类
@@ -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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+ insert into emis_warehouse_in_batch
+
+ 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,
+
+
+ #{id},
+ #{serialNo},
+ #{inNo},
+ #{inBatchNo},
+ #{customerCode},
+ #{customerName},
+ #{orderSn},
+ #{billCode},
+ #{transCarNo},
+ #{entryDate},
+ #{confirmStatus},
+ #{confirmDate},
+ #{status},
+ #{totalParcelQty},
+ #{totalVolume},
+ #{totalWeight},
+ #{remark},
+ #{tenantId},
+ #{delFlag},
+ #{createBy},
+ #{createTime},
+ #{updateBy},
+ #{updateTime},
+ #{createSite},
+ #{updateSite},
+
+
+
+
+ update emis_warehouse_in_batch
+
+ serial_no = #{serialNo},
+ in_no = #{inNo},
+ in_batch_no = #{inBatchNo},
+ customer_code = #{customerCode},
+ customer_name = #{customerName},
+ order_sn = #{orderSn},
+ bill_code = #{billCode},
+ trans_car_no = #{transCarNo},
+ entry_date = #{entryDate},
+ confirm_status = #{confirmStatus},
+ confirm_date = #{confirmDate},
+ status = #{status},
+ total_parcel_qty = #{totalParcelQty},
+ total_volume = #{totalVolume},
+ total_weight = #{totalWeight},
+ remark = #{remark},
+ tenant_id = #{tenantId},
+ del_flag = #{delFlag},
+ create_by = #{createBy},
+ create_time = #{createTime},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+ create_site = #{createSite},
+ update_site = #{updateSite},
+
+ where id = #{id}
+
+
+
+ delete from emis_warehouse_in_batch where id = #{id}
+
+
+
+ delete from emis_warehouse_in_batch where id in
+
+ #{id}
+
+
+
\ No newline at end of file
diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml
new file mode 100644
index 000000000..cd6774ece
--- /dev/null
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInDtlMapper.xml
@@ -0,0 +1,252 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+
+
+
+
+
+ insert into emis_warehouse_in_dtl
+
+ 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,
+
+
+ #{id},
+ #{inNo},
+ #{inChildNo},
+ #{goodsCode},
+ #{goodsName},
+ #{cargoQty},
+ #{abnormalQty},
+ #{outQty},
+ #{unit},
+ #{weight},
+ #{price},
+ #{currency},
+ #{nationArea},
+ #{taxNo},
+ #{hscode},
+ #{brand},
+ #{material},
+ #{purpose},
+ #{ingredients},
+ #{manufacturer},
+ #{supplier},
+ #{function},
+ #{goodsModel},
+ #{grossWeight},
+ #{netWeight},
+ #{length},
+ #{width},
+ #{height},
+ #{volume},
+ #{barcode},
+ #{orderNum},
+ #{remark},
+ #{tenantId},
+ #{delFlag},
+ #{createBy},
+ #{createTime},
+ #{updateBy},
+ #{updateTime},
+ #{createSite},
+ #{updateSite},
+
+
+
+
+ update emis_warehouse_in_dtl
+
+ in_no = #{inNo},
+ in_child_no = #{inChildNo},
+ goods_code = #{goodsCode},
+ goods_name = #{goodsName},
+ cargo_qty = #{cargoQty},
+ abnormal_qty = #{abnormalQty},
+ out_qty = #{outQty},
+ unit = #{unit},
+ weight = #{weight},
+ price = #{price},
+ currency = #{currency},
+ nation_area = #{nationArea},
+ tax_no = #{taxNo},
+ hscode = #{hscode},
+ brand = #{brand},
+ material = #{material},
+ purpose = #{purpose},
+ ingredients = #{ingredients},
+ manufacturer = #{manufacturer},
+ supplier = #{supplier},
+ function = #{function},
+ goods_model = #{goodsModel},
+ gross_weight = #{grossWeight},
+ net_weight = #{netWeight},
+ length = #{length},
+ width = #{width},
+ height = #{height},
+ volume = #{volume},
+ barcode = #{barcode},
+ order_num = #{orderNum},
+ remark = #{remark},
+ tenant_id = #{tenantId},
+ del_flag = #{delFlag},
+ create_by = #{createBy},
+ create_time = #{createTime},
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+ create_site = #{createSite},
+ update_site = #{updateSite},
+
+ where id = #{id}
+
+
+
+ delete from emis_warehouse_in_dtl where id = #{id}
+
+
+
+ delete from emis_warehouse_in_dtl where id in
+
+ #{id}
+
+
+
\ 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"
+
+
+
-
-
+
+
+
+
+
@@ -23,18 +29,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- 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
-
+
insert into emis_warehouse_in
id,
+ serial_no,
in_no,
+ order_sn,
+ bill_code,
customer_code,
customer_name,
- superior_date,
- serial_number,
+ entry_date,
+ confirm_status,
+ confirm_date,
+ used_status,
+ status,
remark,
tenant_id,
del_flag,
@@ -75,11 +94,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id},
+ #{serialNo},
#{inNo},
+ #{orderSn},
+ #{billCode},
#{customerCode},
#{customerName},
- #{superiorDate},
- #{serialNumber},
+ #{entryDate},
+ #{confirmStatus},
+ #{confirmDate},
+ #{usedStatus},
+ #{status},
#{remark},
#{tenantId},
#{delFlag},
@@ -95,11 +120,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update emis_warehouse_in
+ serial_no = #{serialNo},
in_no = #{inNo},
+ order_sn = #{orderSn},
+ bill_code = #{billCode},
customer_code = #{customerCode},
customer_name = #{customerName},
- superior_date = #{superiorDate},
- serial_number = #{serialNumber},
+ entry_date = #{entryDate},
+ confirm_status = #{confirmStatus},
+ confirm_date = #{confirmDate},
+ used_status = #{usedStatus},
+ status = #{status},
remark = #{remark},
tenant_id = #{tenantId},
del_flag = #{delFlag},