src/main/java/cn/ezhizao/project/business/controller/BizInboundOrderController.java

@@ -0,0 +1,65 @@
+package cn.ezhizao.project.business.controller;
+
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.business.domain.BizInboundOrder;
+import cn.ezhizao.project.business.domain.BizInboundOrderDetail;
+import cn.ezhizao.project.business.service.IBizInboundOrderDetailService;
+import cn.ezhizao.project.business.service.IBizInboundOrderService;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+
+@Api("智能仓储")
+@RestController
+@RequestMapping("/business/inboundOrder")
+public class BizInboundOrderController extends BaseController {
+    @Resource
+    private IBizInboundOrderService bizInboundOrderService;
+    @Resource
+    private IBizInboundOrderDetailService bizInboundOrderDetailService;
+
+    @PostMapping("/warehousing")
+    public AjaxResult warehousing(@RequestBody BizInboundOrder bizInboundOrder) {
+        // 根据托盘编码获取入库单列表
+        List<BizInboundOrder> list = bizInboundOrderService.query().eq("transfer_code", bizInboundOrder.getPalletCode()).eq("is_all_inbound", 0).list();
+        List<BizInboundOrderDetail> detailList = bizInboundOrderDetailService.query().in("inbound_order_id", list.stream().map(BizInboundOrder::getId).collect(Collectors.toList())).list();
+
+        if (list.isEmpty()) {
+            return error("没有找到托盘码对应入库单");
+        }
+        List<Map<String, Object>> inboundList = new ArrayList<>();
+        list.forEach(l -> {
+            Map<String, Object> map = new HashMap<>();
+            map.put("palletCode", l.getTransferCode());
+            map.put("inBoundCode", l.getInboundNumber());
+            map.put("keeperCode", l.getStorageUserName());
+            List<Map<String, Object>> datas = new ArrayList<>();
+            detailList.stream().filter(v -> v.getInboundOrderId().equals(l.getId())).forEach(v -> {
+                Map<String, Object> t = new HashMap<String, Object>();
+                t.put("packCode", v.getCertificateCode());
+                t.put("batchCode", v.getLotCode());
+                t.put("materialCode", l.getProductCode());
+                t.put("qty", v.getInboundNum());
+                t.put("customerCode", l.getCompanyCode());
+//                t.put("packDate")
+                datas.add(t);
+            });
+            map.put("datas", datas);
+        });
+        Map<String, Object> returnData = new HashMap<>();
+        returnData.put("palletCode", bizInboundOrder.getPalletCode());
+        returnData.put("packDatas", inboundList);
+        return success(returnData);
+    }
+}

src/main/java/cn/ezhizao/project/business/domain/BizInboundOrder.java

@@ -0,0 +1,224 @@
+package cn.ezhizao.project.business.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 生产入库对象 biz_inbound_order
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+@Data
+@TableName(value = "biz_inbound_order")
+public class BizInboundOrder extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 入库类别 */
+    @Excel(name = "入库类别")
+    @ApiModelProperty(value = "入库类别")
+    private Integer type;
+
+    /** 入库部门id */
+    @ApiModelProperty(value = "入库类别")
+    private Long deptId;
+
+    /** 入库部门 */
+    @Excel(name = "入库部门")
+    @ApiModelProperty(value = "入库部门")
+    private String deptName;
+
+    /** 入库日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "入库日期")
+    private Date inboundTime;
+
+    /** 入库单号 */
+    @Excel(name = "入库单号")
+    @ApiModelProperty(value = "入库单号")
+    private String inboundNumber;
+
+    /** 客户id */
+    @ApiModelProperty(value = "入库单号")
+    private Long companyId;
+
+    /** 客户简称 */
+    @Excel(name = "客户简称")
+    @ApiModelProperty(value = "客户简称")
+    private String companyAlias;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    @ApiModelProperty(value = "客户编码")
+    private String companyCode;
+
+    /** 保管员id */
+    @ApiModelProperty(value = "客户编码")
+    private Long storageUserId;
+
+    /** 保管员编码 */
+    @Excel(name = "保管员编码")
+    @ApiModelProperty(value = "保管员编码")
+    private String storageUserName;
+
+    /** 保管员姓名 */
+    @Excel(name = "保管员姓名")
+    @ApiModelProperty(value = "保管员姓名")
+    private String storageNickName;
+
+    /** 包装线id */
+    @ApiModelProperty(value = "包装线id")
+    private Long packageResourceGroupId;
+
+    /** 包装线名称 */
+    @Excel(name = "包装线名称")
+    @ApiModelProperty(value = "包装线名称")
+    private String packageResourceGroupName;
+
+    /** 包装线号 */
+    @Excel(name = "包装线号")
+    @ApiModelProperty(value = "包装线号")
+    private Long packageResourceGroupLineNo;
+
+    /** 料号 */
+    @Excel(name = "料号")
+    @ApiModelProperty(value = "料号")
+    private String productCode;
+
+    /** 产品种类 */
+    @Excel(name = "产品种类")
+    @ApiModelProperty(value = "产品种类")
+    private String productType;
+
+    /** 有无子件 */
+    @Excel(name = "有无子件")
+    @ApiModelProperty(value = "有无子件")
+    private Integer isSubItem;
+
+    /** 录入者id */
+    @ApiModelProperty(value = "录入者id")
+    private Long inputUserId;
+
+    /** 录入者编码 */
+    @Excel(name = "录入者编码")
+    @ApiModelProperty(value = "录入者编码")
+    private String inputUserName;
+
+    /** 录入者姓名 */
+    @Excel(name = "录入者姓名")
+    @ApiModelProperty(value = "录入者姓名")
+    private String inputNickName;
+
+    /** 入库总量 */
+    @Excel(name = "入库总量")
+    @ApiModelProperty(value = "入库总量")
+    private Long inboundTotalNum;
+
+    /** 存储区域 */
+    @Excel(name = "存储区域")
+    @ApiModelProperty(value = "存储区域")
+    private String storageArea;
+
+    /** 单箱支数 */
+    @Excel(name = "单箱支数")
+    @ApiModelProperty(value = "单箱支数")
+    private Long labelNumber;
+
+    /** 转运码code */
+    @Excel(name = "转运码code")
+    @ApiModelProperty(value = "转运码code")
+    private String transferCode;
+
+    /** 转运码id */
+    @ApiModelProperty(value = "转运码code")
+    private Long transferId;
+
+    /** 原转运码code */
+    @Excel(name = "原转运码code")
+    @ApiModelProperty(value = "原转运码code")
+    private String originalTransferCode;
+
+    /** 是否打印 */
+    @Excel(name = "是否打印")
+    @ApiModelProperty(value = "是否打印")
+    private Integer isPrint;
+
+    /** 反选出库单号 */
+    @Excel(name = "反选出库单号")
+    @ApiModelProperty(value = "反选出库单号")
+    private String reSelectOutgoingOrderNumber;
+
+    /** 箱数 */
+    @Excel(name = "箱数")
+    @ApiModelProperty(value = "箱数")
+    private Long boxNumber;
+
+    /** 厂库 */
+    @Excel(name = "厂库")
+    @ApiModelProperty(value = "厂库")
+    private String factoryWarehouse;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    @ApiModelProperty(value = "单位")
+    private String unit;
+
+    /** 包装形式 */
+    @Excel(name = "包装形式")
+    @ApiModelProperty(value = "包装形式")
+    private String packageType;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    @ApiModelProperty(value = "状态")
+    private String status;
+
+    /** 是否全部入库 */
+    @Excel(name = "是否全部入库")
+    @ApiModelProperty(value = "是否全部入库")
+    private Integer isAllInbound;
+
+
+    private String standard;
+
+    private String drawingNo;
+
+    private Integer isSubclass;
+
+    private String productDescription;
+
+    private String deptCode;
+
+    @TableField(exist = false)
+    private List<BizInboundOrderDetail> details;
+    @TableField(exist = false)
+    private List<List<BizInboundOrderDetail>> detailLists;
+
+    @TableField(exist = false)
+    private Date startTime;
+    @TableField(exist = false)
+    private Date endTime;
+    @TableField(exist = false)
+    private String tenantName;
+    @TableField(exist = false)
+    private String inboundDateStr;
+
+    private Long productId;
+
+    @TableField(exist = false)
+    private String palletCode;
+}

src/main/java/cn/ezhizao/project/business/domain/BizInboundOrderDetail.java

@@ -0,0 +1,202 @@
+package cn.ezhizao.project.business.domain;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 生产入库明细对象 biz_inbound_order_detail
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+@Data
+@TableName(value = "biz_inbound_order_detail")
+public class BizInboundOrderDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 入库单id */
+    @ApiModelProperty(value = "${comment}")
+    private Long inboundOrderId;
+
+    /** 合格证id */
+    @ApiModelProperty(value = "${comment}")
+    private Long certificateId;
+
+    /** 合格证批次id */
+    @ApiModelProperty(value = "${comment}")
+    private Long certificateLotId;
+
+    /** 合格证编码 */
+    @Excel(name = "合格证编码")
+    @ApiModelProperty(value = "合格证编码")
+    private String certificateCode;
+
+    private String lotCode;
+    private Long lotId;
+
+    /** 入库数量 */
+    @Excel(name = "入库数量")
+    @ApiModelProperty(value = "入库数量")
+    private Long inboundNum;
+
+    /** 是否入库 */
+    @Excel(name = "是否入库")
+    @ApiModelProperty(value = "是否入库")
+    private Integer isInbound;
+
+    /** 操作者1id */
+    @ApiModelProperty(value = "是否入库")
+    private Long firstOperatorUserId;
+
+    /** 操作者1编码 */
+    @Excel(name = "操作者1编码")
+    @ApiModelProperty(value = "操作者1编码")
+    private String firstOperatorUserName;
+
+    /** 操作者1名称 */
+    @Excel(name = "操作者1名称")
+    @ApiModelProperty(value = "操作者1名称")
+    private String firstOperatorNickName;
+
+    /** 操作者2id */
+    @ApiModelProperty(value = "操作者1名称")
+    private Long secondOperatorUserId;
+
+    /** 操作者2编码 */
+    @Excel(name = "操作者2编码")
+    @ApiModelProperty(value = "操作者2编码")
+    private String secondOperatorUserName;
+
+    /** 操作者2名称 */
+    @Excel(name = "操作者2名称")
+    @ApiModelProperty(value = "操作者2名称")
+    private String secondOperatorNickName;
+
+    /** 操作者3id */
+    @ApiModelProperty(value = "操作者2名称")
+    private Long thirdOperatorUserId;
+
+    /** 操作者3编码 */
+    @Excel(name = "操作者3编码")
+    @ApiModelProperty(value = "操作者3编码")
+    private String thirdOperatorUserName;
+
+    /** 操作者3名称 */
+    @Excel(name = "操作者3名称")
+    @ApiModelProperty(value = "操作者3名称")
+    private String thirdOperatorNickName;
+
+    /** 包装形式码 */
+    @Excel(name = "包装形式码")
+    @ApiModelProperty(value = "包装形式码")
+    private String packageTypeCode;
+
+    /** 转运托盘码 */
+    @Excel(name = "转运托盘码")
+    @ApiModelProperty(value = "转运托盘码")
+    private String transferCode;
+
+    @TableField(exist = false)
+    private Long productId;
+    @TableField(exist = false)
+    private String productDescription;
+    @TableField(exist = false)
+    private Long companyId;
+    @TableField(exist = false)
+    private String customerName;
+    @TableField(exist = false)
+    private Long deptId;
+    @TableField(exist = false)
+    private Long packageResourceGroupId;
+    @TableField(exist = false)
+    private String deptName;
+    @TableField(exist = false)
+    private String packageResourceGroupName;
+    @TableField(exist = false)
+    private Long packageResourceGroupLineNo;
+    @TableField(exist = false)
+    private String unit;
+    @TableField(exist = false)
+    private String productType;
+    @TableField(exist = false)
+    private Integer isSubclass;
+    @TableField(exist = false)
+    private String standard;
+    @TableField(exist = false)
+    private String drawingNo;
+    @TableField(exist = false)
+    private Long xsyId;
+    @TableField(exist = false)
+    private Long bgyId;
+    @TableField(exist = false)
+    private Long jsyId;
+    /** 销售员号 */
+    @Excel(name = "销售员号")
+    @TableField(exist = false)
+    private String xsyno;
+
+    /** 销售员名 */
+    @Excel(name = "销售员名")
+    @TableField(exist = false)
+    private String xsyna;
+
+    /** 保管员号 */
+    @Excel(name = "保管员号")
+    @ApiModelProperty(value = "保管员号")
+    @TableField(exist = false)
+    private String bgyno;
+
+    /** 保管员名 */
+    @Excel(name = "保管员名")
+    @ApiModelProperty(value = "保管员名")
+    @TableField(exist = false)
+    private String bgyna;
+    /** 技术员号 */
+    @Excel(name = "技术员号")
+    @ApiModelProperty(value = "技术员号")
+    @TableField(exist = false)
+    private String jsyno;
+
+    /** 技术员名 */
+    @Excel(name = "技术员名")
+    @ApiModelProperty(value = "技术员名")
+    @TableField(exist = false)
+    private String jsyna;
+
+    /** 客户简称 */
+    @Excel(name = "客户简称")
+    @ApiModelProperty(value = "客户简称")
+    @TableField(exist = false)
+    private String companyAlias;
+
+    /** 客户编码 */
+    @Excel(name = "客户编码")
+    @TableField(exist = false)
+    @ApiModelProperty(value = "客户编码")
+    private String companyCode;
+
+    /** 单箱支数 */
+    @Excel(name = "单箱支数")
+    @ApiModelProperty(value = "单箱支数")
+    @TableField(exist = false)
+    private Long labelNumber;
+    // 判断可添加
+    @TableField(exist = false)
+    private Boolean checked;
+
+    @TableField(exist = false)
+    private Boolean isFirst;
+
+    @TableField(exist = false)
+    private String productCode;
+    @TableField(exist = false)
+    private String deptCode;
+
+    @TableField(exist =  false)
+    private Long sum;
+}

src/main/java/cn/ezhizao/project/business/mapper/BizInboundOrderDetailMapper.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.mapper;
+
+import cn.ezhizao.project.business.domain.BizInboundOrderDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 生产入库明细Mapper接口
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+public interface BizInboundOrderDetailMapper extends BaseMapper<BizInboundOrderDetail>
+{
+    /**
+     * 查询生产入库明细列表
+     *
+     * @param bizInboundOrderDetail 生产入库明细
+     * @return 生产入库明细集合
+     */
+    public List<BizInboundOrderDetail> getList(BizInboundOrderDetail bizInboundOrderDetail);
+
+    /**
+     * 物理删除
+     * @param bizInboundOrderDetail
+     * @return 删除结果
+    */
+    public int physicalDelete(BizInboundOrderDetail bizInboundOrderDetail);
+}

src/main/java/cn/ezhizao/project/business/mapper/BizInboundOrderMapper.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.mapper;
+
+import cn.ezhizao.project.business.domain.BizInboundOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
+
+/**
+ * 生产入库Mapper接口
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+public interface BizInboundOrderMapper extends BaseMapper<BizInboundOrder>
+{
+    /**
+     * 查询生产入库列表
+     *
+     * @param bizInboundOrder 生产入库
+     * @return 生产入库集合
+     */
+    public List<BizInboundOrder> getList(BizInboundOrder bizInboundOrder);
+
+    /**
+     * 物理删除
+     * @param bizInboundOrder
+     * @return 删除结果
+    */
+    public int physicalDelete(BizInboundOrder bizInboundOrder);
+}

src/main/java/cn/ezhizao/project/business/service/IBizInboundOrderDetailService.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.service;
+
+import cn.ezhizao.project.business.domain.BizInboundOrderDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 生产入库明细Service接口
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+public interface IBizInboundOrderDetailService extends IService<BizInboundOrderDetail>
+{
+    /**
+     * 查询生产入库明细列表
+     *
+     * @param bizInboundOrderDetail 生产入库明细
+     * @return 生产入库明细集合
+     */
+    public List<BizInboundOrderDetail> getList(BizInboundOrderDetail bizInboundOrderDetail);
+
+    /**
+     * 物理删除
+     * @param bizInboundOrderDetail
+     * @return 删除结果
+     */
+    public int physicalDelete(BizInboundOrderDetail bizInboundOrderDetail);
+
+}

src/main/java/cn/ezhizao/project/business/service/IBizInboundOrderService.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.service;
+
+import cn.ezhizao.project.business.domain.BizInboundOrder;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 生产入库Service接口
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+public interface IBizInboundOrderService extends IService<BizInboundOrder>
+{
+    /**
+     * 查询生产入库列表
+     *
+     * @param bizInboundOrder 生产入库
+     * @return 生产入库集合
+     */
+    public List<BizInboundOrder> getList(BizInboundOrder bizInboundOrder);
+
+    /**
+     * 物理删除
+     * @param bizInboundOrder
+     * @return 删除结果
+     */
+    public int physicalDelete(BizInboundOrder bizInboundOrder);
+
+}

src/main/java/cn/ezhizao/project/business/service/impl/BizInboundOrderDetailServiceImpl.java

@@ -0,0 +1,44 @@
+package cn.ezhizao.project.business.service.impl;
+
+import cn.ezhizao.project.business.domain.BizInboundOrderDetail;
+import cn.ezhizao.project.business.mapper.BizInboundOrderDetailMapper;
+import cn.ezhizao.project.business.service.IBizInboundOrderDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 生产入库明细Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+@Service
+public class BizInboundOrderDetailServiceImpl  extends ServiceImpl<BizInboundOrderDetailMapper, BizInboundOrderDetail> implements IBizInboundOrderDetailService
+{
+    @Resource
+    private BizInboundOrderDetailMapper bizInboundOrderDetailMapper;
+
+    /**
+     * 查询生产入库明细列表
+     *
+     * @param bizInboundOrderDetail 生产入库明细
+     * @return 生产入库明细
+     */
+    @Override
+    public List<BizInboundOrderDetail> getList(BizInboundOrderDetail bizInboundOrderDetail)
+    {
+        return bizInboundOrderDetailMapper.getList(bizInboundOrderDetail);
+    }
+
+    /**
+     * 物理删除
+     * @param bizInboundOrderDetail
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizInboundOrderDetail bizInboundOrderDetail){ return bizInboundOrderDetailMapper.physicalDelete(bizInboundOrderDetail); };
+
+}

src/main/java/cn/ezhizao/project/business/service/impl/BizInboundOrderServiceImpl.java

@@ -0,0 +1,44 @@
+package cn.ezhizao.project.business.service.impl;
+
+import cn.ezhizao.project.business.domain.BizInboundOrder;
+import cn.ezhizao.project.business.mapper.BizInboundOrderMapper;
+import cn.ezhizao.project.business.service.IBizInboundOrderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 生产入库Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2025-05-20
+ */
+@Service
+public class BizInboundOrderServiceImpl  extends ServiceImpl<BizInboundOrderMapper, BizInboundOrder> implements IBizInboundOrderService
+{
+    @Resource
+    private BizInboundOrderMapper bizInboundOrderMapper;
+
+    /**
+     * 查询生产入库列表
+     *
+     * @param bizInboundOrder 生产入库
+     * @return 生产入库
+     */
+    @Override
+    public List<BizInboundOrder> getList(BizInboundOrder bizInboundOrder)
+    {
+        return bizInboundOrderMapper.getList(bizInboundOrder);
+    }
+
+    /**
+     * 物理删除
+     * @param bizInboundOrder
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizInboundOrder bizInboundOrder){ return bizInboundOrderMapper.physicalDelete(bizInboundOrder); };
+
+}

src/main/resources/mybatis/business/BizInboundOrderDetailMapper.xml

@@ -0,0 +1,39 @@
+<?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="cn.ezhizao.project.business.mapper.BizInboundOrderDetailMapper">
+
+    <resultMap type="cn.ezhizao.project.business.domain.BizInboundOrderDetail" id="BizInboundOrderDetailResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizInboundOrderDetail" resultMap="BizInboundOrderDetailResult">
+        SELECT * FROM biz_inbound_order_detail
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="certificateCode != null  and certificateCode != ''"> AND certificate_code = #{certificateCode}</if>
+            <if test="inboundNum != null "> AND inbound_num = #{inboundNum}</if>
+            <if test="isInbound != null "> AND is_inbound = #{isInbound}</if>
+            <if test="firstOperatorUserName != null  and firstOperatorUserName != ''"> AND first_operator_user_name like concat('%', #{firstOperatorUserName}, '%')</if>
+            <if test="firstOperatorNickName != null  and firstOperatorNickName != ''"> AND first_operator_nick_name like concat('%', #{firstOperatorNickName}, '%')</if>
+            <if test="secondOperatorUserName != null  and secondOperatorUserName != ''"> AND second_operator_user_name like concat('%', #{secondOperatorUserName}, '%')</if>
+            <if test="secondOperatorNickName != null  and secondOperatorNickName != ''"> AND second_operator_nick_name like concat('%', #{secondOperatorNickName}, '%')</if>
+            <if test="thirdOperatorUserName != null  and thirdOperatorUserName != ''"> AND third_operator_user_name like concat('%', #{thirdOperatorUserName}, '%')</if>
+            <if test="thirdOperatorNickName != null  and thirdOperatorNickName != ''"> AND third_operator_nick_name like concat('%', #{thirdOperatorNickName}, '%')</if>
+            <if test="packageTypeCode != null  and packageTypeCode != ''"> AND package_type_code = #{packageTypeCode}</if>
+            <if test="transferCode != null  and transferCode != ''"> AND transfer_code = #{transferCode}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_inbound_order_detail
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>

src/main/resources/mybatis/business/BizInboundOrderMapper.xml

@@ -0,0 +1,62 @@
+<?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="cn.ezhizao.project.business.mapper.BizInboundOrderMapper">
+
+    <resultMap type="cn.ezhizao.project.business.domain.BizInboundOrder" id="BizInboundOrderResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizInboundOrder" resultMap="BizInboundOrderResult">
+        SELECT t1.*, t2.alias as tenant_name FROM biz_inbound_order t1 left join biz_tenant t2 on t2.id = t1.tenant_id
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            t1.deleted = 0
+            <if test="type != null "> AND t1.type = #{type}</if>
+            <if test="deptName != null  and deptName != ''"> AND t1.dept_name like concat('%', #{deptName}, '%')</if>
+            <if test="inboundTime != null "> AND t1.inbound_time = #{inboundTime}</if>
+            <if test="inboundNumber != null  and inboundNumber != ''"> AND t1.inbound_number like concat('%', #{inboundNumber}, '%')</if>
+            <if test="productDescription != null  and productDescription != ''"> AND t1.product_description like concat('%', #{productDescription}, '%')</if>
+            <if test="deptId != null "> and t1.dept_id = #{deptId}</if>
+            <if test="companyAlias != null  and companyAlias != ''"> AND t1.company_alias = #{companyAlias}</if>
+            <if test="companyCode != null  and companyCode != ''"> AND t1.company_code = #{companyCode}</if>
+            <if test="storageUserName != null  and storageUserName != ''"> AND t1.storage_user_name like concat('%', #{storageUserName}, '%')</if>
+            <if test="storageNickName != null  and storageNickName != ''"> AND t1.storage_nick_name like concat('%', #{storageNickName}, '%')</if>
+            <if test="packageResourceGroupName != null  and packageResourceGroupName != ''"> AND t1.package_resource_group_name like concat('%', #{packageResourceGroupName}, '%')</if>
+            <if test="packageResourceGroupLineNo != null "> AND t1.package_resource_group_line_no = #{packageResourceGroupLineNo}</if>
+            <if test="productCode != null  and productCode != ''"> AND t1.product_code = #{productCode}</if>
+            <if test="productType != null "> AND t1.product_type = #{productType}</if>
+            <if test="isSubItem != null "> AND t1.is_sub_item = #{isSubItem}</if>
+            <if test="inputUserName != null  and inputUserName != ''"> AND t1.input_user_name like concat('%', #{inputUserName}, '%')</if>
+            <if test="inputNickName != null  and inputNickName != ''"> AND t1.input_nick_name like concat('%', #{inputNickName}, '%')</if>
+            <if test="inboundTotalNum != null "> AND t1.inbound_total_num = #{inboundTotalNum}</if>
+            <if test="storageArea != null  and storageArea != ''"> AND t1.storage_area = #{storageArea}</if>
+            <if test="labelNumber != null "> AND t1.label_number = #{labelNumber}</if>
+            <if test="transferCode != null  and transferCode != ''"> AND t1.transfer_code = #{transferCode}</if>
+            <if test="originalTransferCode != null  and originalTransferCode != ''"> AND t1.original_transfer_code = #{originalTransferCode}</if>
+            <if test="isPrint != null "> AND is_print = #{isPrint}</if>
+            <if test="reSelectOutgoingOrderNumber != null  and reSelectOutgoingOrderNumber != ''"> AND t1.re_select_outgoing_order_number like concat('%', #{reSelectOutgoingOrderNumber}, '%')</if>
+            <if test="boxNumber != null "> AND t1.box_number = #{boxNumber}</if>
+            <if test="factoryWarehouse != null  and factoryWarehouse != ''"> AND t1.factory_warehouse = #{factoryWarehouse}</if>
+            <if test="unit != null  and unit != ''"> AND t1.unit = #{unit}</if>
+            <if test="packageType != null  and packageType != ''"> AND t1.package_type = #{packageType}</if>
+            <if test="status != null  and status != ''"> AND t1.status = #{status}</if>
+            <if test="isAllInbound != null "> AND t1.is_all_inbound = #{isAllInbound}</if>
+            <if test="startTime != null ">AND date_format(t1.create_time,'%y%m%d') &gt;=date_format(#{startTime},'%y%m%d') </if>
+            <if test="endTime != null ">AND date_format(t1.create_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')</if>
+            <if test="id != null">and t1.id = #{id}</if>
+        </trim>
+        order by t1.is_print asc, t1.status asc , t1.create_time desc
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_inbound_order
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>