合并冲突

wangyanxiong
2 parents e51310e8 3ecca9bc
Showing 84 changed files with 4823 additions and 1009 deletions
.gitignore
.idea/MyBatisCodeHelperDatasource.xml
.idea/dataSources.xml
src/main/java/com/huaheng/pc/config/materialType/domain/MaterialType.java
src/main/java/com/huaheng/pc/config/materialType/mapper/MaterialTypeMapper.java
src/main/java/com/huaheng/pc/config/materialType/service/MaterialTypeService.java
src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java
src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowDetail.java
src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowHeader.java
src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowDetailService.java
src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java
src/main/java/com/huaheng/pc/inventory/adjustDetail/controller/adjustDetailController.java
src/main/java/com/huaheng/pc/inventory/adjustDetail/domain/AdjustDetail.java
src/main/java/com/huaheng/pc/inventory/adjustDetail/mapper/AdjustDetailMapper.java
src/main/java/com/huaheng/pc/inventory/adjustDetail/service/AdjustDetailService.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/domain/AdjustHeader.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/mapper/AdjustHeaderMapper.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderService.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/controller/CycleCountDetailController.java
@@ -10,7 +10,7 @@ target/
 *.iws
 *.iml
 *.ipr
-.idea/workspace.xml
+#.idea/workspace.xml
 .idea/compiler.xml
  
  
@@ -5,9 +5,9 @@
       <ProjectProfile>
         <option name="addSerializeUid" value="true" />
         <option name="generateService" value="true" />
-        <option name="javaMapperPackage" value="com.huaheng.pc.shipment.wave.mapper" />
+        <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
         <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
-        <option name="javaModelPackage" value="com.huaheng.pc.shipment.wave.domain" />
+        <option name="javaModelPackage" value="com.huaheng.pc.inventory.adjust.domain" />
         <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
         <option name="lastDatabaseCrudChooseModuleName" value="huaheng" />
         <option name="moduleNameToPackageAndPathMap">
@@ -29,13 +29,13 @@
             <entry key="huaheng">
               <value>
                 <UserPackageAndPathInfoByModule>
-                  <option name="javaMapperPackage" value="com.huaheng.pc.shipment.wave.mapper" />
+                  <option name="javaMapperPackage" value="com.huaheng.pc.inventory.adjust.mapper" />
                   <option name="javaMapperPath" value="$PROJECT_DIR$/src/main/java" />
-                  <option name="javaModelPacakge" value="com.huaheng.pc.shipment.wave.domain" />
+                  <option name="javaModelPacakge" value="com.huaheng.pc.inventory.adjust.domain" />
                   <option name="javaModelPath" value="$PROJECT_DIR$/src/main/java" />
-                  <option name="javaServicePackage" value="com.huaheng.pc.shipment.wave.service" />
+                  <option name="javaServicePackage" value="com.huaheng.pc.inventory.adjust.service" />
                   <option name="javaServicePath" value="$PROJECT_DIR$/src/main/java" />
-                  <option name="xmlPackage" value="shipment" />
+                  <option name="xmlPackage" value="inventory" />
                   <option name="xmlPath" value="E:\code\wms2\src\main\resources\mybatis" />
                 </UserPackageAndPathInfoByModule>
               </value>
@@ -45,6 +45,26 @@
         <option name="mybatisPlusStaticField" value="false" />
         <option name="tableGenerateConfigs">
           <map>
+            <entry key="wms_v2:adjust_detail">
+              <value>
+                <TableGenerateConfig>
+                  <option name="generatedKey" value="id" />
+                  <option name="javaModelName" value="AdjustDetail" />
+                  <option name="moduleName" value="huaheng" />
+                  <option name="useActualColumnName" value="true" />
+                </TableGenerateConfig>
+              </value>
+            </entry>
+            <entry key="wms_v2:adjust_header">
+              <value>
+                <TableGenerateConfig>
+                  <option name="generatedKey" value="id" />
+                  <option name="javaModelName" value="AdjustHeader" />
+                  <option name="moduleName" value="huaheng" />
+                  <option name="useActualColumnName" value="true" />
+                </TableGenerateConfig>
+              </value>
+            </entry>
             <entry key="wms_v2:alarm_level">
               <value>
                 <TableGenerateConfig>
@@ -285,6 +305,26 @@
                 </TableGenerateConfig>
               </value>
             </entry>
+            <entry key="wms_v2:receipt_detail_history">
+              <value>
+                <TableGenerateConfig>
+                  <option name="generatedKey" value="id" />
+                  <option name="javaModelName" value="ReceiptDetailHistory" />
+                  <option name="moduleName" value="huaheng" />
+                  <option name="useActualColumnName" value="true" />
+                </TableGenerateConfig>
+              </value>
+            </entry>
+            <entry key="wms_v2:receipt_header_history">
+              <value>
+                <TableGenerateConfig>
+                  <option name="generatedKey" value="id" />
+                  <option name="javaModelName" value="ReceiptHeaderHistory" />
+                  <option name="moduleName" value="huaheng" />
+                  <option name="useActualColumnName" value="true" />
+                </TableGenerateConfig>
+              </value>
+            </entry>
             <entry key="wms_v2:receipt_preference">
               <value>
                 <TableGenerateConfig>
@@ -511,7 +551,7 @@
         <option name="useLomBokOnModel" value="true" />
         <option name="useSwagger" value="true" />
         <option name="userMybatisPlus" value="true" />
-        <option name="xmlMapperPackage" value="shipment" />
+        <option name="xmlMapperPackage" value="inventory" />
         <option name="xmlMapperPath" value="E:\code\wms2\src\main\resources\mybatis" />
       </ProjectProfile>
     </option>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="@172.16.29.45" uuid="2845c0bf-201c-4178-b161-2bab8cfbfe5d">
+    <data-source source="LOCAL" name="@172.16.29.45" uuid="5e014158-5749-424f-a74a-1c32e588e60f">
       <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+package com.huaheng.pc.config.materialType.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.config.materialType.domain.MaterialType")
+@Data
+@TableName(value = "material_type")
+public class MaterialType implements Serializable {
+    /**
+     * ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="ID")
+    private Integer id;
+
+    /**
+     * 编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="编码")
+    private String code;
+
+    /**
+     * 名称
+     */
+    @TableField(value = "name")
+    @ApiModelProperty(value="名称")
+    private String name;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * ABC分类
+     */
+    @TableField(value = "abcClass")
+    @ApiModelProperty(value="ABC分类")
+    private String abcClass;
+
+    /**
+     * 保质期（天）
+     */
+    @TableField(value = "daysToExpire")
+    @ApiModelProperty(value="保质期（天）")
+    private Integer daysToExpire;
+
+    /**
+     * 入库流程
+     */
+    @TableField(value = "receivingFlow")
+    @ApiModelProperty(value="入库流程")
+    private String receivingFlow;
+
+    /**
+     * 出库流程
+     */
+    @TableField(value = "shippingFlow")
+    @ApiModelProperty(value="出库流程")
+    private String shippingFlow;
+
+    /**
+     * 定位规则
+     */
+    @TableField(value = "locatingRule")
+    @ApiModelProperty(value="定位规则")
+    private String locatingRule;
+
+    /**
+     * 分配规则
+     */
+    @TableField(value = "allocationRule")
+    @ApiModelProperty(value="分配规则")
+    private String allocationRule;
+
+    /**
+     * 补货规则
+     */
+    @TableField(value = "replenishmentRule")
+    @ApiModelProperty(value="补货规则")
+    private String replenishmentRule;
+
+    /**
+     * 空货位规则
+     */
+    @TableField(value = "emptyLocRule")
+    @ApiModelProperty(value="空货位规则")
+    private String emptyLocRule;
+
+    /**
+     * 拣货规则
+     */
+    @TableField(value = "pickingRule")
+    @ApiModelProperty(value="拣货规则")
+    private String pickingRule;
+
+    /**
+     * 属性模版
+     */
+    @TableField(value = "attributeTemplateCode")
+    @ApiModelProperty(value="属性模版")
+    private String attributeTemplateCode;
+
+    /**
+     * 记录序列号
+     */
+    @TableField(value = "trackSerialNum")
+    @ApiModelProperty(value="记录序列号")
+    private Integer trackSerialNum;
+
+    /**
+     * 自动生成序列号
+     */
+    @TableField(value = "autoGenSerialNum")
+    @ApiModelProperty(value="自动生成序列号")
+    private Integer autoGenSerialNum;
+
+    /**
+     * 自动生成序列号表达式
+     */
+    @TableField(value = "autoGenSerialNumFormat")
+    @ApiModelProperty(value="自动生成序列号表达式")
+    private String autoGenSerialNumFormat;
+
+    /**
+     * 序列号模版
+     */
+    @TableField(value = "snTemplateCode")
+    @ApiModelProperty(value="序列号模版")
+    private String snTemplateCode;
+
+    /**
+     * 临期预警天数
+     */
+    @TableField(value = "expiringDays")
+    @ApiModelProperty(value="临期预警天数")
+    private Integer expiringDays;
+
+    /**
+     * 收货预警天数
+     */
+    @TableField(value = "minShelfLifeDays")
+    @ApiModelProperty(value="收货预警天数")
+    private Integer minShelfLifeDays;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "enable")
+    @ApiModelProperty(value="状态")
+    private Integer enable;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 是否AGV区域发货
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="是否AGV区域发货")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 商品同步标识
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="商品同步标识")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.config.materialType.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.config.materialType.domain.MaterialType;
+
+public interface MaterialTypeMapper extends BaseMapper<MaterialType> {
+}
 \ No newline at end of file
+package com.huaheng.pc.config.materialType.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.config.materialType.domain.MaterialType;
+import com.huaheng.pc.config.materialType.mapper.MaterialTypeMapper;
+@Service
+public class MaterialTypeService extends ServiceImpl<MaterialTypeMapper, MaterialType> {
+
+}
@@ -15,7 +15,9 @@ import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
+import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
 import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
+import com.huaheng.pc.config.statusFlow.service.StatusFlowHeaderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -35,6 +37,8 @@ public class StatusFlowDetailController extends BaseController {
  
     @Resource
     private StatusFlowDetailService statusFlowDetailService;
+    @Resource
+    private StatusFlowHeaderService statusFlowHeaderService;
  
     private String prefix = "config/statusFlowDetail";
  
@@ -70,7 +74,8 @@ public class StatusFlowDetailController extends BaseController {
                 .eq(StringUtils.isNotEmpty(statusFlowDetail.getRecordType()),
                         StatusFlowDetail::getRecordType, statusFlowDetail.getRecordType())
                 .eq(StringUtils.isNotNull(statusFlowDetail.getNessary()),
-                        StatusFlowDetail::getNessary, statusFlowDetail.getNessary());
+                        StatusFlowDetail::getNessary, statusFlowDetail.getNessary())
+                .orderByAsc(StatusFlowDetail::getSequence);
  
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
             /*使用分页查询*/
@@ -88,7 +93,9 @@ public class StatusFlowDetailController extends BaseController {
      */
     @GetMapping("/add/{headerId}")
     public String add(@PathVariable("headerId")Integer headerId, ModelMap mmap) {
+        StatusFlowHeader statusFlowHeader = statusFlowHeaderService.getById(headerId);
         mmap.put("headerId",headerId);
+        mmap.put("headerCode", statusFlowHeader.getCode());
         return prefix + "/add";
     }
  
@@ -22,9 +22,13 @@ public class StatusFlowDetail implements Serializable {
     private Integer id;
  
     @TableField(value = "headerId")
-    @ApiModelProperty(value="null")
+    @ApiModelProperty(value="头表id")
     private Integer headerId;
  
+    @TableField(value = "headerCode")
+    @ApiModelProperty(value="头表编码")
+    private Integer headerCode;
+
     /**
      * 状态流
      */
@@ -25,14 +25,14 @@ public class StatusFlowHeader implements Serializable {
      * 状态流
      */
     @TableField(value = "code")
-    @ApiModelProperty(value="状态流")
+    @ApiModelProperty(value="编码")
     private String code;
  
     /**
      * 状态流名称
      */
     @TableField(value = "name")
-    @ApiModelProperty(value="状态流名称")
+    @ApiModelProperty(value="名称")
     private String name;
  
     /**
 package com.huaheng.pc.config.statusFlow.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.WeakHashMap;
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
 import com.huaheng.pc.config.statusFlow.mapper.StatusFlowDetailMapper;
 @Service
 public class StatusFlowDetailService extends ServiceImpl<StatusFlowDetailMapper, StatusFlowDetail> {
  
+    public List<StatusFlowDetail> queryStatusFlowDetail(String headerCode){
+        LambdaQueryWrapper<StatusFlowDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        lambdaQueryWrapper.orderByAsc(StatusFlowDetail::getSequence)
+                .eq(StatusFlowDetail::getHeaderCode, headerCode);
+        return this.list(lambdaQueryWrapper);
+    }
 }
 package com.huaheng.pc.config.statusFlow.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
 import com.huaheng.pc.config.statusFlow.mapper.StatusFlowHeaderMapper;
-@Service
+
+import java.util.List;
+import java.util.Map;
+
+@Service("StatusFlow")
 public class StatusFlowHeaderService extends ServiceImpl<StatusFlowHeaderMapper, StatusFlowHeader> {
  
+    public List<Map<String, Object>> flowList(){
+        LambdaQueryWrapper<StatusFlowHeader> lambda = Wrappers.lambdaQuery();
+        lambda.select(StatusFlowHeader::getCode, StatusFlowHeader::getName);
+        return this.listMaps(lambda);
+    }
 }
+package com.huaheng.pc.inventory.adjustDetail.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail;
+import com.huaheng.pc.inventory.adjustDetail.service.AdjustDetailService;
+
+import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+
+@Controller
+@RequestMapping("/inventory/adjustDetail")
+public class adjustDetailController extends BaseController {
+
+
+    @Resource
+    private AdjustHeaderService adjustHeaderService;
+    @Resource
+    private AdjustDetailService adjustDetailService;
+
+
+
+    private String prefix = "inventory/adjustDetail";
+
+
+    //@RequiresPermissions("inventory:cycleCount:view")
+    @GetMapping()
+    public String adjustHeader()
+    {
+        return prefix + "/adjustDetail";
+    }
+
+
+    /**
+     * 查询调整单主列表
+     */
+    //@RequiresPermissions("inventory:cycleCount:list")
+    @PostMapping("/list")
+    @Log(title = "库存-调整",operating = "查看调整明细单", action = BusinessType.GRANT)
+    @ResponseBody
+    public TableDataInfo list(AdjustDetail adjustDetail, String createdBegin, String createdEnd) {
+        LambdaQueryWrapper<AdjustDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), AdjustDetail::getCreated, createdBegin)
+                .le(StringUtils.isNotEmpty(createdEnd), AdjustDetail::getCreated, createdEnd)//创建时间范围
+                .eq(AdjustDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
+                .eq(adjustDetail.getId() != null, AdjustDetail::getId, adjustDetail.getId())//ID
+
+
+                .orderByDesc(AdjustDetail::getId);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            //分页查询
+            Page<AdjustDetail> page = new Page<>(pageNum, pageSize);
+            IPage<AdjustDetail> iPage = adjustDetailService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<AdjustDetail> list = adjustDetailService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+package com.huaheng.pc.inventory.adjustDetail.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail")
+@Data
+@TableName(value = "adjust_detail")
+public class AdjustDetail implements Serializable {
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="null")
+    private Integer id;
+
+    /**
+     * 调整单号
+     */
+    @TableField(value = "adjustCode")
+    @ApiModelProperty(value="调整单号")
+    private String adjustCode;
+
+    /**
+     * 盘点单号
+     */
+    @TableField(value = "cycleCountCode")
+    @ApiModelProperty(value="盘点单号")
+    private String cycleCountCode;
+
+    /**
+     * 盘点单号行号
+     */
+    @TableField(value = "cycleDetailId")
+    @ApiModelProperty(value="盘点明细单号行号")
+    private Integer cycleDetailId;
+
+    /**
+     * 质检单号
+     */
+    @TableField(value = "checkCode")
+    @ApiModelProperty(value="质检单号")
+    private String checkCode;
+
+    /**
+     * 质检明细单号行号
+     */
+    @TableField(value = "checkDetailId")
+    @ApiModelProperty(value="质检明细单号行号")
+    private Integer checkDetailId;
+
+    /**
+     * 调整关联单号
+     */
+    @TableField(value = "referCode")
+    @ApiModelProperty(value="调整关联单号")
+    private String referCode;
+
+    /**
+     * 调整明细关联标识
+     */
+    @TableField(value = "referDetailId")
+    @ApiModelProperty(value="调整明细关联标识")
+    private Integer referDetailId;
+
+    /**
+     * 仓库编码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库编码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 商品编码
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value="商品编码")
+    private String materialCode;
+
+    /**
+     * 商品名称
+     */
+    @TableField(value = "materialName")
+    @ApiModelProperty(value="商品名称")
+    private String materialName;
+
+    /**
+     * 商品规格
+     */
+    @TableField(value = "materialSpec")
+    @ApiModelProperty(value="商品规格")
+    private String materialSpec;
+
+    /**
+     * 商品单位
+     */
+    @TableField(value = "materialUnit")
+    @ApiModelProperty(value="商品单位")
+    private String materialUnit;
+
+    /**
+     * 1盘点 ，2 质检 ，3 调整
+     */
+    @TableField(value = "problemType")
+    @ApiModelProperty(value="1盘点 ，2 质检 ，3 调整")
+    private String problemType;
+
+    /**
+     * 属性号
+     */
+    @TableField(value = "attributeId")
+    @ApiModelProperty(value="属性号")
+    private Integer attributeId;
+
+    /**
+     * 调整前库存状态
+     */
+    @TableField(value = "fromInventorySts")
+    @ApiModelProperty(value="调整前库存状态")
+    private String fromInventorySts;
+
+    /**
+     * 调整后库存状态
+     */
+    @TableField(value = "toInventorySts")
+    @ApiModelProperty(value="调整后库存状态")
+    private String toInventorySts;
+
+    /**
+     * 调整前的数量
+     */
+    @TableField(value = "fromQty")
+    @ApiModelProperty(value="调整前的数量")
+    private Integer fromQty;
+
+    /**
+     * 调整后的数量 
+     */
+    @TableField(value = "toQty")
+    @ApiModelProperty(value="调整后的数量 ")
+    private Integer toQty;
+
+    /**
+     * 调整变动数量 
+     */
+    @TableField(value = "gapQty")
+    @ApiModelProperty(value="调整变动数量 ")
+    private Integer gapQty;
+
+    /**
+     * 状态 -0-待调整 1-已调整 2-未批准 3-已批准
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态 -0-待调整 1-已调整 2-未批准 3-已批准")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建人
+     * */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value = "createdBy")
+    private String createdBy;
+
+    /**
+     * 审批时间
+     */
+    @TableField(value = "agreeTime")
+    @ApiModelProperty(value="审批时间")
+    private Date agreeTime;
+
+    /**
+     * 审批人
+     * */
+    @TableField(value = "agreeBy")
+    @ApiModelProperty(value = "agreeBy")
+    private String agreeBy;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "Remark")
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.adjustDetail.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail;
+
+public interface AdjustDetailMapper extends BaseMapper<AdjustDetail> {
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.adjustDetail.service;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail;
+import com.huaheng.pc.inventory.adjustDetail.mapper.AdjustDetailMapper;
+@Service
+public class AdjustDetailService extends ServiceImpl<AdjustDetailMapper, AdjustDetail> {
+
+}
+package com.huaheng.pc.inventory.adjustHeader.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.inventory.adjustDetail.service.AdjustDetailService;
+import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
+import com.huaheng.pc.inventory.adjustHeader.service.AdjustHeaderService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Controller
+@RequestMapping("/inventory/adjustHeader")
+public class adjustHeaderController extends BaseController {
+
+
+    @Resource
+    private AdjustHeaderService adjustHeaderService;
+    @Resource
+    private AdjustDetailService adjustDetailService;
+
+
+
+    private String prefix = "inventory/adjustHeader";
+
+
+    //@RequiresPermissions("inventory:cycleCount:view")
+    @GetMapping()
+    public String adjustHeader()
+    {
+        return prefix + "/adjustHeader";
+    }
+
+
+    /**
+     * 查询调整单主列表
+     */
+    //@RequiresPermissions("inventory:cycleCount:list")
+    @PostMapping("/list")
+    @Log(title = "库存-调整",operating = "查看调整主单", action = BusinessType.GRANT)
+    @ResponseBody
+    public TableDataInfo list(AdjustHeader adjustHeader, String createdBegin, String createdEnd) {
+        LambdaQueryWrapper<AdjustHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+
+        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), AdjustHeader::getCreated, createdBegin)
+                .le(StringUtils.isNotEmpty(createdEnd), AdjustHeader::getCreated, createdEnd)//创建时间范围
+                .eq(AdjustHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
+                .eq(StringUtils.isNotEmpty(adjustHeader.getCode()),AdjustHeader::getCode,adjustHeader.getCode())//调整单编码
+                .eq(StringUtils.isNotEmpty(adjustHeader.getCompanyCode()),AdjustHeader::getCompanyCode,adjustHeader.getCompanyCode())//货主
+                .eq(StringUtils.isNotEmpty(adjustHeader.getProblemType()),AdjustHeader::getProblemType,adjustHeader.getProblemType())//调整类型
+                .eq(StringUtils.isNotEmpty(adjustHeader.getCycleCountCode()),AdjustHeader::getCycleCountCode,adjustHeader.getCycleCountCode())//盘点单号
+                .eq(StringUtils.isNotEmpty(adjustHeader.getCheckCode()),AdjustHeader::getCheckCode,adjustHeader.getCheckCode())//质检单号
+                .eq(StringUtils.isNotEmpty(adjustHeader.getReferCode()),AdjustHeader::getReferCode,adjustHeader.getReferCode())//上游单编码
+                .eq(StringUtils.isNotEmpty(adjustHeader.getCreatedBy()),AdjustHeader::getCreatedBy,adjustHeader.getCreatedBy())//创建人
+
+                .orderByDesc(AdjustHeader::getId);
+
+        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
+            //分页查询
+            Page<AdjustHeader> page = new Page<>(pageNum, pageSize);
+            IPage<AdjustHeader> iPage = adjustHeaderService.page(page, lambdaQueryWrapper);
+            return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+        } else {
+            List<AdjustHeader> list = adjustHeaderService.list(lambdaQueryWrapper);
+            return getDataTable(list);
+        }
+    }
+
+
+
+
+
+
+
+
+
+
+}
+package com.huaheng.pc.inventory.adjustHeader.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader")
+@Data
+@TableName(value = "adjust_header")
+public class AdjustHeader implements Serializable {
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="null")
+    private Integer id;
+
+    /**
+     * 编码
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="编码")
+    private String code;
+
+    /**
+     * 仓库代码
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库代码")
+    private String warehouseCode;
+
+    /**
+     * 货主编码
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主编码")
+    private String companyCode;
+
+    /**
+     * 1盘点 ，2 质检 ，3 调整
+     */
+    @TableField(value = "problemType")
+    @ApiModelProperty(value="1盘点 ，2 质检 ，3 调整")
+    private String problemType;
+
+    /**
+     * 盘点单号
+     */
+    @TableField(value = "cycleCountCode")
+    @ApiModelProperty(value="盘点单号")
+    private String cycleCountCode;
+
+    /**
+     * 质检单号
+     */
+    @TableField(value = "checkCode")
+    @ApiModelProperty(value="质检单号")
+    private String checkCode;
+
+    /**
+     * 关联上游单号
+     */
+    @TableField(value = "referCode")
+    @ApiModelProperty(value="关联上游单号")
+    private String referCode;
+
+    /**
+     * 关联上游系统原因说明
+     */
+    @TableField(value = "referReason")
+    @ApiModelProperty(value="关联上游系统原因说明")
+    private String referReason;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建人")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.adjustHeader.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
+
+public interface AdjustHeaderMapper extends BaseMapper<AdjustHeader> {
+}
 \ No newline at end of file
+package com.huaheng.pc.inventory.adjustHeader.service;
+
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader;
+import com.huaheng.pc.inventory.adjustHeader.mapper.AdjustHeaderMapper;
+@Service
+public class AdjustHeaderService extends ServiceImpl<AdjustHeaderMapper, AdjustHeader> {
+
+}
@@ -57,16 +57,32 @@ public class CycleCountDetailController extends BaseController {
     @Log(title = "库存-盘点",operating = "查看盘点明细", action = BusinessType.GRANT)
     @ResponseBody
     public TableDataInfo list(CycleCountDetail cycleCountDetail, String createdBegin, String createdEnd) {
+
         LambdaQueryWrapper<CycleCountDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
         Integer pageSize = pageDomain.getPageSize();
  
-        lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
+        lambdaQueryWrapper.ge(
+                StringUtils.isNotEmpty(createdBegin), CycleCountDetail::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), CycleCountDetail::getCreated, createdEnd)//创建时间范围
                 .eq(CycleCountDetail::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
-
-
+                .eq(cycleCountDetail.getCycleCountHeadId() != null ,CycleCountDetail::getCycleCountHeadId,cycleCountDetail.getCycleCountHeadId())//盘点主单
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompanyCode()),CycleCountDetail::getCompanyCode, cycleCountDetail.getCompanyCode())//货主
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getLocationCode()), CycleCountDetail::getLocationCode, cycleCountDetail.getLocationCode()) //库位
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getContainerCode()), CycleCountDetail::getContainerCode,cycleCountDetail.getContainerCode()) //容器
+                .eq(cycleCountDetail.getInventoryDetailId() != null, CycleCountDetail::getInventoryDetailId, cycleCountDetail.getInventoryDetailId())//库存明细ID
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getMaterialCode()), CycleCountDetail::getMaterialCode,cycleCountDetail.getMaterialCode())//物料编码
+                .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialName()), CycleCountDetail::getMaterialName, cycleCountDetail.getMaterialName())//物料名称
+                .like(StringUtils.isNotEmpty(cycleCountDetail.getMaterialSpec()), CycleCountDetail::getMaterialSpec,cycleCountDetail.getMaterialSpec())//物料规格
+                .eq(cycleCountDetail.getTaskHeaderId() != null, CycleCountDetail::getTaskHeaderId, cycleCountDetail.getTaskHeaderId())//任务主表
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getInventorySts()), CycleCountDetail::getInventorySts,cycleCountDetail.getInventorySts())//库存状态
+                .eq(cycleCountDetail.getEnableStatus() != null, CycleCountDetail::getEnableStatus, cycleCountDetail.getEnableStatus())//明细状态
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getBatch()),CycleCountDetail::getBatch,cycleCountDetail.getBatch())//批次
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getLot()),CycleCountDetail::getLot,cycleCountDetail.getLot())//批号
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getProjectNo()),CycleCountDetail::getProjectNo,cycleCountDetail.getProjectNo())//项目号
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getCreatedBy()),CycleCountDetail::getCreatedBy,cycleCountDetail.getCreatedBy())//创建人
+                .eq(StringUtils.isNotEmpty(cycleCountDetail.getCompletedBy()), CycleCountDetail::getCompletedBy,cycleCountDetail.getCompletedBy())//完成人
                 .orderByDesc(CycleCountDetail::getId);
  
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
@@ -132,11 +132,11 @@ public class CycleCountDetail implements Serializable {
     private Long countedQty;
  
     /**
-     * 调整数量
+     * 差异数量
      */
-    @TableField(value = "adjustQty")
-    @ApiModelProperty(value="调整数量")
-    private Long adjustQty;
+    @TableField(value = "gapQty")
+    @ApiModelProperty(value="差异数量")
+    private Long gapQty;
  
     /**
      * 失败原因
@@ -278,83 +278,19 @@ public class CycleCountDetail implements Serializable {
     @ApiModelProperty(value="项目号")
     private String projectNo;
  
-    private static final long serialVersionUID = 1L;
-
-    public static final String COL_ID = "id";
-
-    public static final String COL_COUNTID = "countId";
-
-    public static final String COL_ROUND = "round";
-
-    public static final String COL_TASKHEADERID = "taskHeaderId";
-
-    public static final String COL_TASKDETAILID = "taskDetailId";
-
-    public static final String COL_WAREHOUSECODE = "warehouseCode";
-
-    public static final String COL_INVENTORYDETAILID = "inventoryDetailId";
-
-    public static final String COL_LOCATIONCODE = "locationCode";
-
-    public static final String COL_CONTAINERCODE = "containerCode";
-
-    public static final String COL_MATERIALCODE = "materialCode";
-
-    public static final String COL_MATERIALNAME = "materialName";
-
-    public static final String COL_MATERIALSPEC = "materialSpec";
-
-    public static final String COL_MATERIALUNIT = "materialUnit";
-
-    public static final String COL_COMPANYCODE = "companyCode";
-
-    public static final String COL_INVENTORYSTS = "inventorySts";
-
-    public static final String COL_SYSTEMQTY = "systemQty";
-
-    public static final String COL_COUNTEDQTY = "countedQty";
-
-    public static final String COL_ADJUSTQTY = "adjustQty";
-
-    public static final String COL_REJECTIONNOTE = "rejectionNote";
-
-    public static final String COL_COUNTEDBY = "countedBy";
  
-    public static final String COL_COUNTEDAT = "countedAt";
-
-    public static final String COL_ASSIGNEDTO = "assignedTo";
-
-    public static final String COL_ASSIGNEDAT = "assignedAt";
-
-    public static final String COL_COMPLETEDBY = "completedBy";
-
-    public static final String COL_COMPLETEDAT = "completedAt";
-
-    public static final String COL_ENABLESTATUS = "enableStatus";
-
-    public static final String COL_CREATED = "created";
-
-    public static final String COL_CREATEDBY = "createdBy";
-
-    public static final String COL_LASTUPDATED = "lastUpdated";
-
-    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
-
-    public static final String COL_VERSION = "version";
-
-    public static final String COL_USERDEF1 = "userDef1";
-
-    public static final String COL_USERDEF2 = "userDef2";
+    /**
+     * 盘点主单号
+     * */
+    @TableField(value = "cycleCountHeadId")
+    @ApiModelProperty(value = "盘点主单号")
+    private Integer cycleCountHeadId;
  
-    public static final String COL_USERDEF3 = "userDef3";
  
-    public static final String COL_PROCESSSTAMP = "processStamp";
  
-    public static final String COL_BATCH = "batch";
  
-    public static final String COL_LOT = "lot";
+    private static final long serialVersionUID = 1L;
  
-    public static final String COL_PROJECTNO = "projectNo";
  
     /**
      * 获取ID
@@ -665,19 +601,14 @@ public class CycleCountDetail implements Serializable {
     /**
      * 获取调整数量
      *
-     * @return adjustQty - 调整数量
+     * @return gapQty- 调整数量
      */
-    public Long getAdjustQty() {
-        return adjustQty;
+    public Long getGapQty() {
+        return gapQty;
     }
  
-    /**
-     * 设置调整数量
-     *
-     * @param adjustQty 调整数量
-     */
-    public void setAdjustQty(Long adjustQty) {
-        this.adjustQty = adjustQty;
+    public void setGapQty(Long gapQty) {
+        this.gapQty = gapQty;
     }
  
     /**
@@ -1039,4 +970,12 @@ public class CycleCountDetail implements Serializable {
     public void setProjectNo(String projectNo) {
         this.projectNo = projectNo;
     }
+
+    public Integer getCycleCountHeadId() {
+        return cycleCountHeadId;
+    }
+
+    public void setCycleCountHeadId(Integer cycleCountHeadId) {
+        this.cycleCountHeadId = cycleCountHeadId;
+    }
 }
 \ No newline at end of file
@@ -69,9 +69,12 @@ public class CycleCountHeaderController extends BaseController {
         lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), CycleCountHeader::getCreated, createdBegin)
                 .le(StringUtils.isNotEmpty(createdEnd), CycleCountHeader::getCreated, createdEnd)//创建时间范围
                 .eq(CycleCountHeader::getWarehouseCode, ShiroUtils.getWarehouseCode()) //仓库
-
-
-
+                .eq(StringUtils.isNotEmpty(cycleCountHeader.getSourceCode()),CycleCountHeader::getSourceCode,cycleCountHeader.getSourceCode())//源盘点单号
+                .eq(cycleCountHeader.getId() != null, CycleCountHeader::getId,cycleCountHeader.getId())//ID
+                .eq(StringUtils.isNotEmpty(cycleCountHeader.getMasterCode()),CycleCountHeader::getMasterCode, cycleCountHeader.getMasterCode())//盘点主表编号
+                .eq(cycleCountHeader.getCountOrderId() != null, CycleCountHeader::getCountOrderId, cycleCountHeader.getCountOrderId())//原始盘点ID
+                .eq(cycleCountHeader.getStatusCyc() != null, CycleCountHeader::getStatusCyc, cycleCountHeader.getStatusCyc()) //盘点单状态
+                .eq(cycleCountHeader.getCountType() != null ,CycleCountHeader::getCountType, cycleCountHeader.getCountType())//盘点类型
                 .orderByDesc(CycleCountHeader::getId);
  
         if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
@@ -208,13 +208,6 @@ public class InventoryTransaction implements Serializable {
     private String lockCode;
  
     /**
-     * 上次盘点日期
-     */
-    @TableField(value = "lastCycleCountDate")
-    @ApiModelProperty(value="上次盘点日期")
-    private Date lastCycleCountDate;
-
-    /**
      * 创建时间
      */
     @TableField(value = "created")
@@ -285,4 +278,6 @@ public class InventoryTransaction implements Serializable {
     @ApiModelProperty(value = "供应商编码")
     private String supplierCode;
  
+
+
 }
 \ No newline at end of file
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.aspectj.lang.annotation.Log;
@@ -22,11 +24,13 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.ibatis.annotations.Param;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
  
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
  
@@ -108,4 +112,81 @@ public class ReceiptDetailController extends BaseController {
     public AjaxResult addSave(ReceiptDetail receiptDetail) {
        return receiptDetailService.saveReceiptDetaial(receiptDetail);
     }
+
+    /**
+     * 修改入库明细
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
+        ReceiptDetail receiptDetail  = receiptDetailService.getById(id);
+        mmap.put("receiptDetail", receiptDetail);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存入库单
+     */
+    @ApiOperation(value="修改入库单 ", notes="修改入库单 ", httpMethod = "POST")
+    @RequiresPermissions("receipt:receiptDetail:add")
+    @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.INSERT)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(
+            @ApiParam(name="receiptDetail",value="入库详情") ReceiptDetail receiptDetail) {
+        return receiptDetailService.updateReceiptDetaial(receiptDetail);
+    }
+
+    /**
+     * 删除入库单
+     */
+    //@ApiOperation(value="删除入库单 ", notes="删除入库单 ", httpMethod = "POST")
+    //@RequiresPermissions("receipt:receiptDetail:add")
+    //@Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.INSERT)
+    //@PostMapping("/edit")
+    //@ResponseBody
+    //public AjaxResult remove(String ids) {
+    //    if (StringUtils.isEmpty(ids)){
+    //        return AjaxResult.error("id为空");
+    //    }
+    //    List<Integer> list = new ArrayList<>();
+    //    for (Integer id : Convert.toIntArray(ids)){
+    //        list.add(id);
+    //    }
+    //    return toAjax(receiptDetailService.removeByIds(list));
+    //}
+
+    /**
+     * 审核入库单
+     */
+    @ApiOperation(value="审核入库单", notes="审核入库单", httpMethod = "POST")
+    @RequiresPermissions("receipt:receiptDetail:approval")
+    @Log(title = "入库-入库单 ",operating = "审核入库单 ", action = BusinessType.UPDATE)
+    @PostMapping("/approval")
+    @ResponseBody
+    public AjaxResult approval(@ApiParam(name="id",value="入库明细表id") String ids,
+                               @ApiParam(name="approval",value="审核结果值，10审核驳回，20作废，100审核成功") Integer approval) {
+
+        if (StringUtils.isEmpty(ids)){
+            return AjaxResult.error("id不能为空");
+        }
+        if (approval != 10 || approval != 20 || approval != 100){
+            return AjaxResult.error("传入参数错误");
+        }
+        for (Integer id : Convert.toIntArray(ids)) {
+            ReceiptDetail receiptDetail = new ReceiptDetail();
+            receiptDetail.setId(id);
+            receiptDetail.setProcessStamp(String.valueOf(approval));
+            receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+            if (receiptDetailService.updateById(receiptDetail)){
+                ReceiptHeader receiptHeader = new ReceiptHeader();
+                receiptHeader.setFirstStatus(approval);
+                receiptHeader.setId(receiptDetail.getReceiptId());
+                receiptHeaderService.updateById(receiptHeader);
+            } else {
+                throw new ServiceException("审核失败");
+            }
+        }
+
+        return AjaxResult.success("审核成功");
+    }
 }
@@ -7,4 +7,5 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
  
     AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail);
  
+    AjaxResult updateReceiptDetaial(ReceiptDetail receiptDetail);
 }
@@ -2,10 +2,19 @@ package com.huaheng.pc.receipt.receiptDetail.service;
  
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.material.domain.Material;
 import com.huaheng.pc.config.material.service.MaterialService;
+import com.huaheng.pc.config.materialType.domain.MaterialType;
+import com.huaheng.pc.config.materialType.service.MaterialTypeService;
+import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
+import com.huaheng.pc.config.receiptPreference.service.ReceiptPreferenceService;
+import com.huaheng.pc.config.receiptType.domain.ReceiptType;
+import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
+import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
+import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
 import org.aspectj.weaver.loadtime.Aj;
@@ -25,6 +34,14 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     private MaterialService materialService;
     @Resource
     private ReceiptHeaderService receiptHeaderService;
+    @Resource
+    private ReceiptTypeService receiptTypeService;
+    @Resource
+    private StatusFlowDetailService statusFlowDetailService;
+    @Resource
+    private MaterialTypeService materialTypeService;
+    @Resource
+    private ReceiptPreferenceService receiptPreferenceService;
  
     /**
      * 新增入库明细
@@ -34,15 +51,17 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
     @Transactional
     public AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail){
         /* 判断入库头表状态*/
-        LambdaQueryWrapper<ReceiptHeader> lambda = Wrappers.lambdaQuery();
-        lambda.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
-        ReceiptHeader receiptHeader = receiptHeaderService.getOne(lambda);
+        LambdaQueryWrapper<ReceiptHeader> lambdaReceiptHeader = Wrappers.lambdaQuery();
+        lambdaReceiptHeader.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
+        ReceiptHeader receiptHeader = receiptHeaderService.getOne(lambdaReceiptHeader);
+
+        //判断入库头表状态
         if (receiptHeader == null ){
-            return AjaxResult.error("找不到主单据");
+            throw new ServiceException("找不到主单据");
         } else if (receiptHeader.getFirstStatus() > 100){
-            return AjaxResult.error("单据进入订单池后，不允许新增明细");
+            throw new ServiceException("单据进入订单池后，不允许新增明细");
         } else if (receiptHeader.getFirstStatus() == 20) {
-            return AjaxResult.error("单据销毁");
+            throw new ServiceException("单据已作废");
         }
         receiptDetail.setReceiptCode(receiptHeader.getCode());
  
@@ -51,7 +70,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         lambdaQueryWrapper.eq(Material::getCode, receiptDetail.getMaterialCode());
         Material material = materialService.getOne(lambdaQueryWrapper);
         if (material == null) {
-            return AjaxResult.error("物料不存在");
+            throw new ServiceException("物料不存在");
         }
         receiptDetail.setCompanyCode(material.getCompanyCode());
         receiptDetail.setMaterialName(material.getName());
@@ -62,6 +81,36 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
         receiptDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
  
+        //查询头表中绑定的入库类型中的入库流程
+        LambdaQueryWrapper<ReceiptType> lambdaReceiptType = Wrappers.lambdaQuery();
+        lambdaReceiptType.eq(ReceiptType::getCode,  receiptHeader.getReceiptType());
+        ReceiptType receiptType = receiptTypeService.getOne(lambdaReceiptType);
+        if (receiptType.getReceiptFlow() != null){
+            //物料是否有入库流程
+            List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptType.getReceiptFlow());
+            receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
+        } else if (material.getReceivingFlow() != null){
+            //物料是否有入库流程
+            List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(material.getReceivingFlow());
+            receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
+        } else {
+            //该物料类别是否有入库流程
+            LambdaQueryWrapper<MaterialType> lambdaMaterialType = Wrappers.lambdaQuery();
+            lambdaMaterialType.eq(MaterialType::getCode, material.getType());
+            MaterialType materialType = materialTypeService.getOne(lambdaMaterialType);
+            if (materialType.getReceivingFlow() != null) {
+                List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(materialType.getReceivingFlow());
+                receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
+            } else {
+                //以上都没有的情况下查询入库首选项中的入库流程
+                LambdaQueryWrapper<ReceiptPreference> lambda = Wrappers.lambdaQuery();
+                lambda.last("Limit 1");
+                ReceiptPreference receiptPreference = receiptPreferenceService.getOne(lambda);
+                List<StatusFlowDetail> statusFlowDetails = statusFlowDetailService.queryStatusFlowDetail(receiptPreference.getReceivingFlow());
+                receiptDetail.setProcessStamp(statusFlowDetails.get(0).getFlowCode());
+            }
+        }
+
         if (this.save(receiptDetail)) {
             receiptHeader.setTotalQty(receiptHeader.getTotalQty()+receiptDetail.getTotalQty());
             receiptHeader.setTotalLines(receiptHeader.getTotalLines()+1);
@@ -72,4 +121,49 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
         }
  
     }
+
+    /**
+     * 修改入库明细
+     * @param receiptDetail
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult updateReceiptDetaial(ReceiptDetail receiptDetail) {
+        /* 先修改入库头表中的总数量和总行数，再更新记录，完成后更新入库头表中总数量和总行数*/
+
+        //查询原记录
+        ReceiptDetail originalReceiptDetail= this.getById(receiptDetail.getId());
+        ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
+        //判断物料编码是否被修改
+        if (!originalReceiptDetail.getMaterialCode().equals(receiptDetail.getMaterialCode())){
+            LambdaQueryWrapper<Material> lambdaMaterial = Wrappers.lambdaQuery();
+            lambdaMaterial.eq(Material::getCode,receiptDetail.getMaterialCode());
+            Material material = materialService.getOne(lambdaMaterial);
+            if (material == null) {
+                throw new ServiceException("该物料编码不存在");
+
+            }else {
+                receiptDetail.setMaterialName(material.getName());
+                receiptDetail.setMaterialSpec(material.getSpec());
+                receiptDetail.setMaterialUnit(material.getUnit());
+
+                receiptHeader.setTotalQty(receiptHeader.getTotalQty()-originalReceiptDetail.getTotalQty());
+                receiptHeader.setTotalLines(receiptHeader.getTotalLines()-1);
+                if ( !receiptHeaderService.updateById(receiptHeader)){
+                    return AjaxResult.error("入库头表更新失败");
+                }
+            }
+        }
+
+        receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
+        if ( !this.updateById(receiptDetail) ){
+            return AjaxResult.error("入库明细更新失败");
+        } else {
+            receiptHeader.setTotalQty(receiptHeader.getTotalQty()+receiptDetail.getTotalQty());
+            receiptHeader.setTotalLines(receiptHeader.getTotalLines()+1);
+            receiptHeaderService.updateById(receiptHeader);
+            return AjaxResult.success("修改单据明细成功");
+        }
+    }
 }
+package com.huaheng.pc.receipt.receiptDetailHistory.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory")
+@Data
+@TableName(value = "receipt_detail_history")
+public class ReceiptDetailHistory implements Serializable {
+    /**
+     * 入库明细内部号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="入库明细内部号")
+    private Integer id;
+
+    /**
+     * 入库单头内部号
+     */
+    @TableField(value = "receiptId")
+    @ApiModelProperty(value="入库单头内部号")
+    private Integer receiptId;
+
+    /**
+     * 入库单
+     */
+    @TableField(value = "receiptCode")
+    @ApiModelProperty(value="入库单")
+    private String receiptCode;
+
+    /**
+     * 仓库
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库")
+    private String warehouseCode;
+
+    /**
+     * 货主
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主")
+    private String companyCode;
+
+    /**
+     * 物料编码
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value="物料编码")
+    private String materialCode;
+
+    /**
+     * 物料信息
+     */
+    @TableField(value = "materialName")
+    @ApiModelProperty(value="物料信息")
+    private String materialName;
+
+    /**
+     * 物料规格
+     */
+    @TableField(value = "materialSpec")
+    @ApiModelProperty(value="物料规格")
+    private String materialSpec;
+
+    /**
+     * 物料单位
+     */
+    @TableField(value = "materialUnit")
+    @ApiModelProperty(value="物料单位")
+    private String materialUnit;
+
+    /**
+     * 供应商编码
+     */
+    @TableField(value = "supplierCode")
+    @ApiModelProperty(value="供应商编码")
+    private String supplierCode;
+
+    /**
+     * 批次
+     */
+    @TableField(value = "batch")
+    @ApiModelProperty(value="批次")
+    private String batch;
+
+    /**
+     * 批号
+     */
+    @TableField(value = "lot")
+    @ApiModelProperty(value="批号")
+    private String lot;
+
+    /**
+     * 质检
+     */
+    @TableField(value = "qcCheck")
+    @ApiModelProperty(value="质检")
+    private String qcCheck;
+
+    /**
+     * 项目号
+     */
+    @TableField(value = "projectNo")
+    @ApiModelProperty(value="项目号")
+    private String projectNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "manufactureDate")
+    @ApiModelProperty(value="生产日期")
+    private Date manufactureDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expirationDate")
+    @ApiModelProperty(value="失效日期")
+    private Date expirationDate;
+
+    /**
+     * 入库日期
+     */
+    @TableField(value = "agingDate")
+    @ApiModelProperty(value="入库日期")
+    private Date agingDate;
+
+    /**
+     * 属性模板
+     */
+    @TableField(value = "attributeTemplateCode")
+    @ApiModelProperty(value="属性模板")
+    private String attributeTemplateCode;
+
+    /**
+     * 属性1
+     */
+    @TableField(value = "attribute1")
+    @ApiModelProperty(value="属性1")
+    private String attribute1;
+
+    /**
+     * 属性2
+     */
+    @TableField(value = "attribute2")
+    @ApiModelProperty(value="属性2")
+    private String attribute2;
+
+    /**
+     * 属性3
+     */
+    @TableField(value = "attribute3")
+    @ApiModelProperty(value="属性3")
+    private String attribute3;
+
+    /**
+     * 属性4
+     */
+    @TableField(value = "attribute4")
+    @ApiModelProperty(value="属性4")
+    private String attribute4;
+
+    /**
+     * 总数量
+     */
+    @TableField(value = "totalQty")
+    @ApiModelProperty(value="总数量")
+    private Integer totalQty;
+
+    /**
+     * 未收数量
+     */
+    @TableField(value = "openQty")
+    @ApiModelProperty(value="未收数量")
+    private Integer openQty;
+
+    /**
+     * ERP单号
+     */
+    @TableField(value = "referCode")
+    @ApiModelProperty(value="ERP单号")
+    private String referCode;
+
+    /**
+     * ERP内部号
+     */
+    @TableField(value = "referId")
+    @ApiModelProperty(value="ERP内部号")
+    private Integer referId;
+
+    /**
+     * ERP行号
+     */
+    @TableField(value = "referLineNum")
+    @ApiModelProperty(value="ERP行号")
+    private String referLineNum;
+
+    /**
+     * 定位规则
+     */
+    @TableField(value = "locatingRule")
+    @ApiModelProperty(value="定位规则")
+    private String locatingRule;
+
+    /**
+     * 库存状态
+     */
+    @TableField(value = "inventorySts")
+    @ApiModelProperty(value="库存状态")
+    private String inventorySts;
+
+    /**
+     * 标价
+     */
+    @TableField(value = "itemListPrice")
+    @ApiModelProperty(value="标价")
+    private BigDecimal itemListPrice;
+
+    /**
+     * 净价
+     */
+    @TableField(value = "itemNetPrice")
+    @ApiModelProperty(value="净价")
+    private BigDecimal itemNetPrice;
+
+    /**
+     * 是否虚拟套件
+     */
+    @TableField(value = "isVirtualBom")
+    @ApiModelProperty(value="是否虚拟套件")
+    private Integer isVirtualBom;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    /**
+     * 是否删除
+     */
+    @TableField(value = "deleted")
+    @ApiModelProperty(value="是否删除")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.receipt.receiptDetailHistory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory;
+
+public interface ReceiptDetailHistoryMapper extends BaseMapper<ReceiptDetailHistory> {
+}
 \ No newline at end of file
+package com.huaheng.pc.receipt.receiptDetailHistory.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory;
+import com.huaheng.pc.receipt.receiptDetailHistory.mapper.ReceiptDetailHistoryMapper;
+@Service
+public class ReceiptDetailHistoryService extends ServiceImpl<ReceiptDetailHistoryMapper, ReceiptDetailHistory> {
+
+}
@@ -16,7 +16,9 @@ import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
@@ -49,7 +51,9 @@ public class ReceiptHeaderController extends BaseController {
     @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(ReceiptHeader receiptHeader, String createdBegin, String createdEnd) {
+    public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库头表")ReceiptHeader receiptHeader,
+                              @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
+                              @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
         LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
@@ -122,4 +126,41 @@ public class ReceiptHeaderController extends BaseController {
         receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
         return toAjax(receiptHeaderService.updateById(receiptHeader));
     }
+
+    /**
+     * 审核入库单
+     */
+    @ApiOperation(value="审核入库单", notes="审核入库单", httpMethod = "POST")
+    @RequiresPermissions("receipt:receiptHeader:approval")
+    @Log(title = "入库-入库单 ",operating = "审核入库单 ", action = BusinessType.UPDATE)
+    @PostMapping("/approval")
+    @ResponseBody
+    public AjaxResult approval(@ApiParam(name="id",value="入库头表id") Integer id,
+                               @ApiParam(name="approval",value="审核结果值，10审核驳回，20作废，100审核成功") Integer approval) {
+        ReceiptHeader receiptHeader = new ReceiptHeader();
+        if (approval != 10 || approval != 20 || approval != 100){
+            return AjaxResult.error("传入参数错误");
+        }
+        receiptHeader.setId(id);
+        receiptHeader.setLastStatus(approval);
+        receiptHeader.setFirstStatus(approval);
+        receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+        return toAjax(receiptHeaderService.updateById(receiptHeader));
+    }
+
+    /**
+     * 提交审核入库单
+     */
+    @ApiOperation(value="提交审核入库单", notes="提交审核入库单", httpMethod = "POST")
+    @RequiresPermissions("receipt:receiptHeader:approval")
+    @Log(title = "入库-入库单 ",operating = "提交审核入库单 ", action = BusinessType.UPDATE)
+    @PostMapping("/submitReview")
+    @ResponseBody
+    public AjaxResult submitReview(@ApiParam(name="id",value="入库头表id") Integer id) {
+        ReceiptHeader receiptHeader = new ReceiptHeader();
+        receiptHeader.setId(id);
+        receiptHeader.setFirstStatus(5);
+        receiptHeader.setLastStatus(5);
+        return toAjax(receiptHeaderService.updateById(receiptHeader));
+    }
 }
@@ -3,10 +3,13 @@ package com.huaheng.pc.receipt.receiptHeader.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.config.receiptType.domain.ReceiptType;
 import com.huaheng.pc.config.receiptType.service.ReceiptTypeService;
+import com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail;
+import com.huaheng.pc.config.statusFlow.service.StatusFlowDetailService;
 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
 import org.springframework.stereotype.Service;
@@ -14,19 +17,29 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
  
 @Service
 public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, ReceiptHeader> {
  
     @Resource
     private ReceiptTypeService receiptTypeService;
+    @Resource
+    private StatusFlowDetailService statusFlowDetailService;
  
     public AjaxResult saveReceiptHeader(ReceiptHeader receiptHeader){
         LambdaQueryWrapper<ReceiptType> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ReceiptType::getCode, receiptHeader.getReceiptType());
-        if(receiptTypeService.getOne(lambdaQueryWrapper) == null) {
-            return  AjaxResult.error("没有对应的入库单类型");
+        ReceiptType receiptType = receiptTypeService.getOne(lambdaQueryWrapper);
+
+        //流程详情查询
+        LambdaQueryWrapper<StatusFlowDetail> lambdaStatus = Wrappers.lambdaQuery();
+        lambdaStatus.orderByAsc(StatusFlowDetail::getSequence);
+
+        if(receiptType == null) {
+            throw new ServiceException("没有对应的入库单类型");
         }
+
         String code = createCode(receiptHeader.getReceiptType());
         receiptHeader.setCode(code);
         receiptHeader.setFirstStatus(0);
+package com.huaheng.pc.receipt.receiptHeaderHistory.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Data;
+
+@ApiModel(value="com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory")
+@Data
+@TableName(value = "receipt_header_history")
+public class ReceiptHeaderHistory implements Serializable {
+    /**
+     * 入库单内部号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="入库单内部号")
+    private Integer id;
+
+    /**
+     * 仓库
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库")
+    private String warehouseCode;
+
+    /**
+     * 货主
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主")
+    private String companyCode;
+
+    /**
+     * 入库单号
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value="入库单号")
+    private String code;
+
+    /**
+     * 入库类型
+     */
+    @TableField(value = "receiptType")
+    @ApiModelProperty(value="入库类型")
+    private String receiptType;
+
+    /**
+     * 首状态
+     */
+    @TableField(value = "firstStatus")
+    @ApiModelProperty(value="首状态")
+    private Integer firstStatus;
+
+    /**
+     * 尾状态
+     */
+    @TableField(value = "lastStatus")
+    @ApiModelProperty(value="尾状态")
+    private Integer lastStatus;
+
+    /**
+     * 关联单号
+     */
+    @TableField(value = "referCode")
+    @ApiModelProperty(value="关联单号")
+    private String referCode;
+
+    /**
+     * 关联单号（内部号）
+     */
+    @TableField(value = "referId")
+    @ApiModelProperty(value="关联单号（内部号）")
+    private Integer referId;
+
+    /**
+     * 关联订单类型
+     */
+    @TableField(value = "referType")
+    @ApiModelProperty(value="关联订单类型")
+    private String referType;
+
+    /**
+     * 预计到达日期
+     */
+    @TableField(value = "scheduledArriveDate")
+    @ApiModelProperty(value="预计到达日期")
+    private Date scheduledArriveDate;
+
+    /**
+     * 实际到达日期
+     */
+    @TableField(value = "actualArriveDate")
+    @ApiModelProperty(value="实际到达日期")
+    private Date actualArriveDate;
+
+    /**
+     * 月台货位
+     */
+    @TableField(value = "recvDock")
+    @ApiModelProperty(value="月台货位")
+    private String recvDock;
+
+    /**
+     * 关闭时间
+     */
+    @TableField(value = "closedAt")
+    @ApiModelProperty(value="关闭时间")
+    private Date closedAt;
+
+    /**
+     * 强制关闭用户
+     */
+    @TableField(value = "closedBy")
+    @ApiModelProperty(value="强制关闭用户")
+    private String closedBy;
+
+    /**
+     * 开始收货日期
+     */
+    @TableField(value = "startCheckinDatetime")
+    @ApiModelProperty(value="开始收货日期")
+    private Date startCheckinDatetime;
+
+    /**
+     * 结束收货日期
+     */
+    @TableField(value = "endCheckinDatetime")
+    @ApiModelProperty(value="结束收货日期")
+    private Date endCheckinDatetime;
+
+    /**
+     * 总数量
+     */
+    @TableField(value = "totalQty")
+    @ApiModelProperty(value="总数量")
+    private Integer totalQty;
+
+    /**
+     * 总行数
+     */
+    @TableField(value = "totalLines")
+    @ApiModelProperty(value="总行数")
+    private Integer totalLines;
+
+    /**
+     * 总箱数
+     */
+    @TableField(value = "toalCases")
+    @ApiModelProperty(value="总箱数")
+    private Integer toalCases;
+
+    /**
+     * 总重量
+     */
+    @TableField(value = "totalWeight")
+    @ApiModelProperty(value="总重量")
+    private BigDecimal totalWeight;
+
+    /**
+     * 总体积
+     */
+    @TableField(value = "totalVolume")
+    @ApiModelProperty(value="总体积")
+    private BigDecimal totalVolume;
+
+    /**
+     * 入库单备注
+     */
+    @TableField(value = "receiptNote")
+    @ApiModelProperty(value="入库单备注")
+    private String receiptNote;
+
+    /**
+     * 锁定
+     */
+    @TableField(value = "locked")
+    @ApiModelProperty(value="锁定")
+    private Integer locked;
+
+    /**
+     * 锁定用户
+     */
+    @TableField(value = "lockedBy")
+    @ApiModelProperty(value="锁定用户")
+    private String lockedBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 自定义字段4
+     */
+    @TableField(value = "userDef4")
+    @ApiModelProperty(value="自定义字段4")
+    private String userDef4;
+
+    /**
+     * 自定义字段5
+     */
+    @TableField(value = "userDef5")
+    @ApiModelProperty(value="自定义字段5")
+    private String userDef5;
+
+    /**
+     * 自定义字段6
+     */
+    @TableField(value = "userDef6")
+    @ApiModelProperty(value="自定义字段6")
+    private String userDef6;
+
+    /**
+     * 自定义字段7
+     */
+    @TableField(value = "userDef7")
+    @ApiModelProperty(value="自定义字段7")
+    private String userDef7;
+
+    /**
+     * 自定义字段8
+     */
+    @TableField(value = "userDef8")
+    @ApiModelProperty(value="自定义字段8")
+    private String userDef8;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    /**
+     * 是否删除
+     */
+    @TableField(value = "deleted")
+    @ApiModelProperty(value="是否删除")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.huaheng.pc.receipt.receiptHeaderHistory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
+
+public interface ReceiptHeaderHistoryMapper extends BaseMapper<ReceiptHeaderHistory> {
+}
 \ No newline at end of file
+package com.huaheng.pc.receipt.receiptHeaderHistory.service;
+
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
+import com.huaheng.pc.receipt.receiptHeaderHistory.mapper.ReceiptHeaderHistoryMapper;
+@Service
+public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistoryMapper, ReceiptHeaderHistory> {
+
+}
@@ -15,6 +15,8 @@ import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
+import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
+import com.huaheng.pc.shipment.shipmentDetailHistory.service.ShipmentDetailHistoryService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -24,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
  
 /**
- * 出库明细 信息操作处理
+ * 历史出库明细 信息操作处理
  * 
  * @author huaheng
  * @date 2018-08-19
@@ -36,12 +38,12 @@ public class ShipmentDetailHistoryController extends BaseController
     private String prefix = "shipment/shipmentDetailHistory";
  
 	@Autowired
-	private ShipmentDetailService shipmentDetailService;
+	private ShipmentDetailHistoryService shipmentDetailHistoryService;
  
  
 	@RequiresPermissions("shipment:bill:view")
     @GetMapping("/{shipmentId}/{shipmentCode}")
-	public String shipmentDetail(@PathVariable("shipmentId") String shipmentId, @PathVariable("shipmentCode") String shipmentCode,@PathVariable("inventoryStatus") String inventoryStatus, ModelMap mmap)
+	public String shipmentHistoryDetail(@PathVariable("shipmentId") String shipmentId, @PathVariable("shipmentCode") String shipmentCode,@PathVariable("inventoryStatus") String inventoryStatus, ModelMap mmap)
 	{
         mmap.put("receiptId", shipmentId);
 		mmap.put("shipmentCode", shipmentCode);
@@ -53,31 +55,31 @@ public class ShipmentDetailHistoryController extends BaseController
 	 * 查询出库明细列表
 	 */
 	@RequiresPermissions("shipment:bill:list")
-	@Log(title = "出库-出库单", operating= "查看出库明细", action = BusinessType.GRANT)
+	@Log(title = "出库-历史出库单", operating= "查看历史出库明细", action = BusinessType.GRANT)
 	@PostMapping("/list")
 	@ResponseBody
-	public TableDataInfo list(ShipmentDetail shipmentDetail)
+	public TableDataInfo list(ShipmentDetailHistory shipmentDetailHistory)
 	{
-		LambdaQueryWrapper<ShipmentDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
+		LambdaQueryWrapper<ShipmentDetailHistory> lambdaQueryWrapper = Wrappers.lambdaQuery();
 		PageDomain pageDomain = TableSupport.buildPageRequest();
 		Integer pageNum = pageDomain.getPageNum();
 		Integer pageSize = pageDomain.getPageSize();
  
 		lambdaQueryWrapper
-				.eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode())
-				.in(ShipmentDetail::getCompanyCode,ShiroUtils.getCompanyCodeList())
-				.eq(StringUtils.isNotEmpty(shipmentDetail.getShipmentCode()),ShipmentDetail::getShipmentCode,shipmentDetail.getShipmentCode())
-				.orderByAsc(ShipmentDetail::getId);
+				.eq(ShipmentDetailHistory::getWarehouseCode,ShiroUtils.getWarehouseCode())
+				.in(ShipmentDetailHistory::getCompanyCode,ShiroUtils.getCompanyCodeList())
+				.eq(StringUtils.isNotEmpty(shipmentDetailHistory.getShipmentCode()),ShipmentDetailHistory::getShipmentCode,shipmentDetailHistory.getShipmentCode())
+				.orderByAsc(ShipmentDetailHistory::getId);
  
 		if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
 			/**
 			 * 使用分页查询
 			 */
-			Page<ShipmentDetail> page = new Page<>(pageNum, pageSize);
-			IPage<ShipmentDetail> iPage = shipmentDetailService.page(page, lambdaQueryWrapper);
+			Page<ShipmentDetailHistory> page = new Page<>(pageNum, pageSize);
+			IPage<ShipmentDetailHistory> iPage = shipmentDetailHistoryService.page(page, lambdaQueryWrapper);
 			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
 		} else {
-			List<ShipmentDetail> list = shipmentDetailService.list(lambdaQueryWrapper);
+			List<ShipmentDetailHistory> list = shipmentDetailHistoryService.list(lambdaQueryWrapper);
 			return getDataTable(list);
 		}
 	}
@@ -87,12 +89,12 @@ public class ShipmentDetailHistoryController extends BaseController
 	 * 删除出库明细
 	 */
 	@RequiresPermissions("shipment:bill:remove")
-	@Log(title = "出库-出库单", operating= "删除出库明细", action = BusinessType.DELETE)
+	@Log(title = "出库-历史出库单", operating= "删除历史出库明细", action = BusinessType.DELETE)
 	@PostMapping( "/remove")
 	@ResponseBody
 	public AjaxResult remove(String ids)
 	{
-        AjaxResult result = shipmentDetailService.deleteDetail(ids);
+        AjaxResult result = shipmentDetailHistoryService.deleteDetail(ids);
 		return result;
 	}
  
+package com.huaheng.pc.shipment.shipmentDetailHistory.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetailHistory")
+@TableName(value = "shipment_detail_history")
+public class ShipmentDetailHistory implements Serializable {
+    /**
+     * 出库单内部行号
+     */
+     @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value="出库单内部行号")
+    private Integer id;
+
+    /**
+     * 出库单内部号
+     */
+    @TableField(value = "shipmentId")
+    @ApiModelProperty(value="出库单内部号")
+    private Integer shipmentId;
+
+    /**
+     * 仓库
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value="仓库")
+    private String warehouseCode;
+
+    /**
+     * 货主
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value="货主")
+    private String companyCode;
+
+    /**
+     * 出库单号
+     */
+    @TableField(value = "shipmentCode")
+    @ApiModelProperty(value="出库单号")
+    private String shipmentCode;
+
+    /**
+     * 上游订单号
+     */
+    @TableField(value = "referCode")
+    @ApiModelProperty(value="上游订单号")
+    private String referCode;
+
+    /**
+     * 上游订单内部号
+     */
+    @TableField(value = "referId")
+    @ApiModelProperty(value="上游订单内部号")
+    private Integer referId;
+
+    /**
+     * 上游订单行号
+     */
+    @TableField(value = "referLineNum")
+    @ApiModelProperty(value="上游订单行号")
+    private String referLineNum;
+
+    /**
+     * 物料
+     */
+    @TableField(value = "materialCode")
+    @ApiModelProperty(value="物料")
+    private String materialCode;
+
+    /**
+     * 物料描述
+     */
+    @TableField(value = "materialName")
+    @ApiModelProperty(value="物料描述")
+    private String materialName;
+
+    /**
+     * 物料规格
+     */
+    @TableField(value = "materialSpec")
+    @ApiModelProperty(value="物料规格")
+    private String materialSpec;
+
+    /**
+     * 物料单位
+     */
+    @TableField(value = "materialUnit")
+    @ApiModelProperty(value="物料单位")
+    private String materialUnit;
+
+    /**
+     * 发货数量
+     */
+    @TableField(value = "shipQty")
+    @ApiModelProperty(value="发货数量")
+    private BigDecimal shipQty;
+
+    /**
+     * 请求数量
+     */
+    @TableField(value = "requestQty")
+    @ApiModelProperty(value="请求数量")
+    private BigDecimal requestQty;
+
+    /**
+     * 分配规则
+     */
+    @TableField(value = "allocationRule")
+    @ApiModelProperty(value="分配规则")
+    private String allocationRule;
+
+    /**
+     * 补货规则
+     */
+    @TableField(value = "replenishmentRule")
+    @ApiModelProperty(value="补货规则")
+    private String replenishmentRule;
+
+    /**
+     * 拣货货位
+     */
+    @TableField(value = "pickLocs")
+    @ApiModelProperty(value="拣货货位")
+    private String pickLocs;
+
+    /**
+     * 属性1
+     */
+    @TableField(value = "attribute1")
+    @ApiModelProperty(value="属性1")
+    private String attribute1;
+
+    /**
+     * 属性2
+     */
+    @TableField(value = "attribute2")
+    @ApiModelProperty(value="属性2")
+    private String attribute2;
+
+    /**
+     * 属性3
+     */
+    @TableField(value = "attribute3")
+    @ApiModelProperty(value="属性3")
+    private String attribute3;
+
+    /**
+     * 属性4
+     */
+    @TableField(value = "attribute4")
+    @ApiModelProperty(value="属性4")
+    private String attribute4;
+
+    /**
+     * 批次
+     */
+    @TableField(value = "batch")
+    @ApiModelProperty(value="批次")
+    private String batch;
+
+    /**
+     * 批号
+     */
+    @TableField(value = "lot")
+    @ApiModelProperty(value="批号")
+    private String lot;
+
+    /**
+     * 项目号
+     */
+    @TableField(value = "projectNo")
+    @ApiModelProperty(value="项目号")
+    private String projectNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "manufactureDate")
+    @ApiModelProperty(value="生产日期")
+    private Date manufactureDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expirationDate")
+    @ApiModelProperty(value="失效日期")
+    private Date expirationDate;
+
+    /**
+     * 入库日期
+     */
+    @TableField(value = "agingDate")
+    @ApiModelProperty(value="入库日期")
+    private Date agingDate;
+
+    /**
+     * 库存状态
+     */
+    @TableField(value = "inventorySts")
+    @ApiModelProperty(value="库存状态")
+    private String inventorySts;
+
+    /**
+     * 月台货位
+     */
+    @TableField(value = "dockLoc")
+    @ApiModelProperty(value="月台货位")
+    private String dockLoc;
+
+    /**
+     * 包装分类
+     */
+    @TableField(value = "packingClass")
+    @ApiModelProperty(value="包装分类")
+    private String packingClass;
+
+
+    /**
+     * 状态
+     */
+    @TableField(value = "status")
+    @ApiModelProperty(value="状态")
+    private Integer status;
+
+    /**
+     * 波次号
+     */
+    @TableField(value = "waveId")
+    @ApiModelProperty(value="波次号")
+    private Integer waveId;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value="创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value="创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value="创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value="更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value="数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value="自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value="自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value="自定义字段3")
+    private String userDef3;
+
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value="处理标记")
+    private String processStamp;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_SHIPMENTID = "shipmentId";
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_SHIPMENTCODE = "shipmentCode";
+
+    public static final String COL_REFERCODE = "referCode";
+
+    public static final String COL_REFERID = "referId";
+
+    public static final String COL_REFERLINENUM = "referLineNum";
+
+    public static final String COL_MATERIALCODE = "materialCode";
+
+    public static final String COL_MATERIALNAME = "materialName";
+
+    public static final String COL_MATERIALSPEC = "materialSpec";
+
+    public static final String COL_MATERIALUNIT = "materialUnit";
+
+    public static final String COL_SHIPQTY = "shipQty";
+
+    public static final String COL_REQUESTQTY = "requestQty";
+
+    public static final String COL_ALLOCATIONRULE = "allocationRule";
+
+    public static final String COL_REPLENISHMENTRULE = "replenishmentRule";
+
+    public static final String COL_PICKLOCS = "pickLocs";
+
+    public static final String COL_ATTRIBUTE1 = "attribute1";
+
+    public static final String COL_ATTRIBUTE2 = "attribute2";
+
+    public static final String COL_ATTRIBUTE3 = "attribute3";
+
+    public static final String COL_ATTRIBUTE4 = "attribute4";
+
+    public static final String COL_BATCH = "batch";
+
+    public static final String COL_LOT = "lot";
+
+    public static final String COL_PROJECTNO = "projectNo";
+
+    public static final String COL_MANUFACTUREDATE = "manufactureDate";
+
+    public static final String COL_EXPIRATIONDATE = "expirationDate";
+
+    public static final String COL_AGINGDATE = "agingDate";
+
+    public static final String COL_INVENTORYSTS = "inventorySts";
+
+    public static final String COL_DOCKLOC = "dockLoc";
+
+    public static final String COL_PACKINGCLASS = "packingClass";
+
+    public static final String COL_ENABLE = "enable";
+
+    public static final String COL_WAVEID = "waveId";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+
+    /**
+     * 获取出库单内部行号
+     *
+     * @return id - 出库单内部行号
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 设置出库单内部行号
+     *
+     * @param id 出库单内部行号
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取出库单内部号
+     *
+     * @return shipmentId - 出库单内部号
+     */
+    public Integer getShipmentId() {
+        return shipmentId;
+    }
+
+    /**
+     * 设置出库单内部号
+     *
+     * @param shipmentId 出库单内部号
+     */
+    public void setShipmentId(Integer shipmentId) {
+        this.shipmentId = shipmentId;
+    }
+
+    /**
+     * 获取仓库
+     *
+     * @return warehouseCode - 仓库
+     */
+    public String getWarehouseCode() {
+        return warehouseCode;
+    }
+
+    /**
+     * 设置仓库
+     *
+     * @param warehouseCode 仓库
+     */
+    public void setWarehouseCode(String warehouseCode) {
+        this.warehouseCode = warehouseCode;
+    }
+
+    /**
+     * 获取货主
+     *
+     * @return companyCode - 货主
+     */
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    /**
+     * 设置货主
+     *
+     * @param companyCode 货主
+     */
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    /**
+     * 获取出库单号
+     *
+     * @return shipmentCode - 出库单号
+     */
+    public String getShipmentCode() {
+        return shipmentCode;
+    }
+
+    /**
+     * 设置出库单号
+     *
+     * @param shipmentCode 出库单号
+     */
+    public void setShipmentCode(String shipmentCode) {
+        this.shipmentCode = shipmentCode;
+    }
+
+    /**
+     * 获取上游订单号
+     *
+     * @return referCode - 上游订单号
+     */
+    public String getReferCode() {
+        return referCode;
+    }
+
+    /**
+     * 设置上游订单号
+     *
+     * @param referCode 上游订单号
+     */
+    public void setReferCode(String referCode) {
+        this.referCode = referCode;
+    }
+
+    /**
+     * 获取上游订单内部号
+     *
+     * @return referId - 上游订单内部号
+     */
+    public Integer getReferId() {
+        return referId;
+    }
+
+    /**
+     * 设置上游订单内部号
+     *
+     * @param referId 上游订单内部号
+     */
+    public void setReferId(Integer referId) {
+        this.referId = referId;
+    }
+
+    /**
+     * 获取上游订单行号
+     *
+     * @return referLineNum - 上游订单行号
+     */
+    public String getReferLineNum() {
+        return referLineNum;
+    }
+
+    /**
+     * 设置上游订单行号
+     *
+     * @param referLineNum 上游订单行号
+     */
+    public void setReferLineNum(String referLineNum) {
+        this.referLineNum = referLineNum;
+    }
+
+    /**
+     * 获取物料
+     *
+     * @return materialCode - 物料
+     */
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    /**
+     * 设置物料
+     *
+     * @param materialCode 物料
+     */
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode;
+    }
+
+    /**
+     * 获取物料描述
+     *
+     * @return materialName - 物料描述
+     */
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    /**
+     * 设置物料描述
+     *
+     * @param materialName 物料描述
+     */
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName;
+    }
+
+    /**
+     * 获取物料规格
+     *
+     * @return materialSpec - 物料规格
+     */
+    public String getMaterialSpec() {
+        return materialSpec;
+    }
+
+    /**
+     * 设置物料规格
+     *
+     * @param materialSpec 物料规格
+     */
+    public void setMaterialSpec(String materialSpec) {
+        this.materialSpec = materialSpec;
+    }
+
+    /**
+     * 获取物料单位
+     *
+     * @return materialUnit - 物料单位
+     */
+    public String getMaterialUnit() {
+        return materialUnit;
+    }
+
+    /**
+     * 设置物料单位
+     *
+     * @param materialUnit 物料单位
+     */
+    public void setMaterialUnit(String materialUnit) {
+        this.materialUnit = materialUnit;
+    }
+
+    public BigDecimal getShipQty() {
+        return shipQty;
+    }
+
+    public void setShipQty(BigDecimal shipQty) {
+        this.shipQty = shipQty;
+    }
+
+    public BigDecimal getRequestQty() {
+        return requestQty;
+    }
+
+    public void setRequestQty(BigDecimal requestQty) {
+        this.requestQty = requestQty;
+    }
+
+    /**
+     * 获取分配规则
+     *
+     * @return allocationRule - 分配规则
+     */
+    public String getAllocationRule() {
+        return allocationRule;
+    }
+
+    /**
+     * 设置分配规则
+     *
+     * @param allocationRule 分配规则
+     */
+    public void setAllocationRule(String allocationRule) {
+        this.allocationRule = allocationRule;
+    }
+
+    /**
+     * 获取补货规则
+     *
+     * @return replenishmentRule - 补货规则
+     */
+    public String getReplenishmentRule() {
+        return replenishmentRule;
+    }
+
+    /**
+     * 设置补货规则
+     *
+     * @param replenishmentRule 补货规则
+     */
+    public void setReplenishmentRule(String replenishmentRule) {
+        this.replenishmentRule = replenishmentRule;
+    }
+
+    /**
+     * 获取拣货货位
+     *
+     * @return pickLocs - 拣货货位
+     */
+    public String getPickLocs() {
+        return pickLocs;
+    }
+
+    /**
+     * 设置拣货货位
+     *
+     * @param pickLocs 拣货货位
+     */
+    public void setPickLocs(String pickLocs) {
+        this.pickLocs = pickLocs;
+    }
+
+    /**
+     * 获取属性1
+     *
+     * @return attribute1 - 属性1
+     */
+    public String getAttribute1() {
+        return attribute1;
+    }
+
+    /**
+     * 设置属性1
+     *
+     * @param attribute1 属性1
+     */
+    public void setAttribute1(String attribute1) {
+        this.attribute1 = attribute1;
+    }
+
+    /**
+     * 获取属性2
+     *
+     * @return attribute2 - 属性2
+     */
+    public String getAttribute2() {
+        return attribute2;
+    }
+
+    /**
+     * 设置属性2
+     *
+     * @param attribute2 属性2
+     */
+    public void setAttribute2(String attribute2) {
+        this.attribute2 = attribute2;
+    }
+
+    /**
+     * 获取属性3
+     *
+     * @return attribute3 - 属性3
+     */
+    public String getAttribute3() {
+        return attribute3;
+    }
+
+    /**
+     * 设置属性3
+     *
+     * @param attribute3 属性3
+     */
+    public void setAttribute3(String attribute3) {
+        this.attribute3 = attribute3;
+    }
+
+    /**
+     * 获取属性4
+     *
+     * @return attribute4 - 属性4
+     */
+    public String getAttribute4() {
+        return attribute4;
+    }
+
+    /**
+     * 设置属性4
+     *
+     * @param attribute4 属性4
+     */
+    public void setAttribute4(String attribute4) {
+        this.attribute4 = attribute4;
+    }
+
+    /**
+     * 获取批次
+     *
+     * @return batch - 批次
+     */
+    public String getBatch() {
+        return batch;
+    }
+
+    /**
+     * 设置批次
+     *
+     * @param batch 批次
+     */
+    public void setBatch(String batch) {
+        this.batch = batch;
+    }
+
+    /**
+     * 获取批号
+     *
+     * @return lot - 批号
+     */
+    public String getLot() {
+        return lot;
+    }
+
+    /**
+     * 设置批号
+     *
+     * @param lot 批号
+     */
+    public void setLot(String lot) {
+        this.lot = lot;
+    }
+
+    /**
+     * 获取项目号
+     *
+     * @return projectNo - 项目号
+     */
+    public String getProjectNo() {
+        return projectNo;
+    }
+
+    /**
+     * 设置项目号
+     *
+     * @param projectNo 项目号
+     */
+    public void setProjectNo(String projectNo) {
+        this.projectNo = projectNo;
+    }
+
+    /**
+     * 获取生产日期
+     *
+     * @return manufactureDate - 生产日期
+     */
+    public Date getManufactureDate() {
+        return manufactureDate;
+    }
+
+    /**
+     * 设置生产日期
+     *
+     * @param manufactureDate 生产日期
+     */
+    public void setManufactureDate(Date manufactureDate) {
+        this.manufactureDate = manufactureDate;
+    }
+
+    /**
+     * 获取失效日期
+     *
+     * @return expirationDate - 失效日期
+     */
+    public Date getExpirationDate() {
+        return expirationDate;
+    }
+
+    /**
+     * 设置失效日期
+     *
+     * @param expirationDate 失效日期
+     */
+    public void setExpirationDate(Date expirationDate) {
+        this.expirationDate = expirationDate;
+    }
+
+    /**
+     * 获取入库日期
+     *
+     * @return agingDate - 入库日期
+     */
+    public Date getAgingDate() {
+        return agingDate;
+    }
+
+    /**
+     * 设置入库日期
+     *
+     * @param agingDate 入库日期
+     */
+    public void setAgingDate(Date agingDate) {
+        this.agingDate = agingDate;
+    }
+
+    /**
+     * 获取库存状态
+     *
+     * @return inventorySts - 库存状态
+     */
+    public String getInventorySts() {
+        return inventorySts;
+    }
+
+    /**
+     * 设置库存状态
+     *
+     * @param inventorySts 库存状态
+     */
+    public void setInventorySts(String inventorySts) {
+        this.inventorySts = inventorySts;
+    }
+
+    /**
+     * 获取月台货位
+     *
+     * @return dockLoc - 月台货位
+     */
+    public String getDockLoc() {
+        return dockLoc;
+    }
+
+    /**
+     * 设置月台货位
+     *
+     * @param dockLoc 月台货位
+     */
+    public void setDockLoc(String dockLoc) {
+        this.dockLoc = dockLoc;
+    }
+
+    /**
+     * 获取包装分类
+     *
+     * @return packingClass - 包装分类
+     */
+    public String getPackingClass() {
+        return packingClass;
+    }
+
+    /**
+     * 设置包装分类
+     *
+     * @param packingClass 包装分类
+     */
+    public void setPackingClass(String packingClass) {
+        this.packingClass = packingClass;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取波次号
+     *
+     * @return waveId - 波次号
+     */
+    public Integer getWaveId() {
+        return waveId;
+    }
+
+    /**
+     * 设置波次号
+     *
+     * @param waveId 波次号
+     */
+    public void setWaveId(Integer waveId) {
+        this.waveId = waveId;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return created - 创建时间
+     */
+    public Date getCreated() {
+        return created;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param created 创建时间
+     */
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+    /**
+     * 获取创建用户
+     *
+     * @return createdBy - 创建用户
+     */
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * 设置创建用户
+     *
+     * @param createdBy 创建用户
+     */
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return lastUpdated - 创建时间
+     */
+    public Date getLastUpdated() {
+        return lastUpdated;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param lastUpdated 创建时间
+     */
+    public void setLastUpdated(Date lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    /**
+     * 获取更新用户
+     *
+     * @return lastUpdatedBy - 更新用户
+     */
+    public String getLastUpdatedBy() {
+        return lastUpdatedBy;
+    }
+
+    /**
+     * 设置更新用户
+     *
+     * @param lastUpdatedBy 更新用户
+     */
+    public void setLastUpdatedBy(String lastUpdatedBy) {
+        this.lastUpdatedBy = lastUpdatedBy;
+    }
+
+    /**
+     * 获取数据版本
+     *
+     * @return version - 数据版本
+     */
+    public Integer getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置数据版本
+     *
+     * @param version 数据版本
+     */
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
+
+    /**
+     * 获取自定义字段1
+     *
+     * @return userDef1 - 自定义字段1
+     */
+    public String getUserDef1() {
+        return userDef1;
+    }
+
+    /**
+     * 设置自定义字段1
+     *
+     * @param userDef1 自定义字段1
+     */
+    public void setUserDef1(String userDef1) {
+        this.userDef1 = userDef1;
+    }
+
+    /**
+     * 获取自定义字段2
+     *
+     * @return userDef2 - 自定义字段2
+     */
+    public String getUserDef2() {
+        return userDef2;
+    }
+
+    /**
+     * 设置自定义字段2
+     *
+     * @param userDef2 自定义字段2
+     */
+    public void setUserDef2(String userDef2) {
+        this.userDef2 = userDef2;
+    }
+
+    /**
+     * 获取自定义字段3
+     *
+     * @return userDef3 - 自定义字段3
+     */
+    public String getUserDef3() {
+        return userDef3;
+    }
+
+    /**
+     * 设置自定义字段3
+     *
+     * @param userDef3 自定义字段3
+     */
+    public void setUserDef3(String userDef3) {
+        this.userDef3 = userDef3;
+    }
+
+
+    /**
+     * 获取处理标记
+     *
+     * @return processStamp - 处理标记
+     */
+    public String getProcessStamp() {
+        return processStamp;
+    }
+
+    /**
+     * 设置处理标记
+     *
+     * @param processStamp 处理标记
+     */
+    public void setProcessStamp(String processStamp) {
+        this.processStamp = processStamp;
+    }
+}
 \ No newline at end of file
+package com.huaheng.pc.shipment.shipmentDetailHistory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
+
+import java.util.List;
+import java.util.Map;
+
+
+public interface ShipmentDetailHistoryMapper extends BaseMapper<ShipmentDetailHistory> {
+
+
+    List<Map<String,Integer>> SelectFirstStatus(String ids);
+
+    Integer batchDelete(String[] ids);
+
+    Map<String,String> StatisticalByReceiptId(Integer headerId);
+
+}
 \ No newline at end of file
+package com.huaheng.pc.shipment.shipmentDetailHistory.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
+
+public interface ShipmentDetailHistoryService extends IService<ShipmentDetailHistory>{
+
+    AjaxResult deleteDetail(String id);
+
+
+}
+package com.huaheng.pc.shipment.shipmentDetailHistory.service;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.common.utils.DataUtils;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
+import com.huaheng.pc.shipment.shipmentDetailHistory.mapper.ShipmentDetailHistoryMapper;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHistoryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ShipmentDetailHistoryServiceImpl extends ServiceImpl<ShipmentDetailHistoryMapper, ShipmentDetailHistory> implements ShipmentDetailHistoryService {
+
+
+    @Resource
+    private ShipmentDetailHistoryMapper shipmentDetailHistoryMapper;
+    @Autowired
+    private ShipmentHeaderHistoryService shipmentHeaderHistoryService;
+
+    /**
+     * 删除出库单据明细
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    @Transactional
+    public AjaxResult deleteDetail(String id) {
+        if (StringUtils.isEmpty(id))
+            return AjaxResult.error("id不能为空");
+        String[] ids = id.split(",");
+        List<Map<String,Integer>> list = shipmentDetailHistoryMapper.SelectFirstStatus(id);
+        if (list.size() < 1) {
+            return AjaxResult.error("找不到主单据！");
+        }
+        if (list.size() > 1) {
+            return AjaxResult.error("有多个主单据，不能一起删除！");
+        }
+        if (list.get(0).get("firstStatus") > 100) {
+            return AjaxResult.error("单据状进入订单池，不允许删除明细");
+        }
+        Integer result = shipmentDetailHistoryMapper.batchDelete(ids);
+        if (result > 0) {
+            Integer headerId=list.get(0).get("id");
+            Map<String,String> map= shipmentDetailHistoryMapper.StatisticalByReceiptId(headerId);
+            if(DataUtils.getInteger(map.get("totalLines")) <= 0)    {
+                shipmentHeaderHistoryService.removeById(headerId);
+            }
+            else    {
+                //更新表头的总行数和总数量统计
+                ShipmentHeaderHistory shipmentHeaderHistory = new ShipmentHeaderHistory();
+                shipmentHeaderHistory.setId(headerId);
+                shipmentHeaderHistory.setTotalLines(DataUtils.getInteger(map.get("totalLines")));
+                shipmentHeaderHistory.setTotalQty(DataUtils.getBigDecimal(map.get("totalQty")));
+                shipmentHeaderHistoryService.saveOrUpdate(shipmentHeaderHistory);
+            }
+            return AjaxResult.success("删除单据明细成功");
+        }
+        else
+            return AjaxResult.error("删除单据明细失败");
+    }
+}
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
 import com.huaheng.common.utils.security.ShiroUtils;
@@ -11,7 +12,6 @@ import com.huaheng.framework.aspectj.lang.annotation.Log;
 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
 import com.huaheng.framework.web.controller.BaseController;
 import com.huaheng.framework.web.domain.AjaxResult;
-import com.huaheng.framework.web.domain.RetCode;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
@@ -22,9 +22,11 @@ import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
  
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
  
  
@@ -44,7 +46,6 @@ public class ShipmentHeaderController extends BaseController
 	private ShipmentHeaderService shipmentHeaderService;
 	@Autowired
 	private ShipmentDetailService shipmentDetailService;
-
  
 	@RequiresPermissions("shipment:bill:view")
 	@GetMapping()
@@ -155,18 +156,25 @@ public class ShipmentHeaderController extends BaseController
 	@Log(title = "出库-出库单", operating="删除出库主单", action = BusinessType.DELETE)
 	@PostMapping( "/remove")
 	@ResponseBody
-	public AjaxResult remove(String ids)  {
+	@Transactional
+	public AjaxResult remove(String ids) throws InvocationTargetException, IllegalAccessException {
 		if (StringUtils.isEmpty(ids))
 			return AjaxResult.error("id不能为空");
 		for (Integer id : Convert.toIntArray(ids))
 		{
-			ShipmentHeader shipmentHeader=new ShipmentHeader();
-			shipmentHeader.setId(id);
+			ShipmentHeader shipmentHeader=shipmentHeaderService.getById(id);
+
+			//出库单设定为历史出库单，并删除出库单
+			shipmentHeaderService.addHistory(shipmentHeader);
 			shipmentHeader.setDeleted(true);
-			boolean result=shipmentHeaderService.updateById(shipmentHeader);
+			boolean result=shipmentHeaderService.removeById(id);
 			if(result==false){
-				return AjaxResult.error("删除失败");
+				throw new ServiceException("删除失败");
 			}
+			LambdaQueryWrapper<ShipmentDetail> shipmentDetailLambdaQueryWrapper=Wrappers.lambdaQuery();
+			shipmentDetailLambdaQueryWrapper.eq(ShipmentDetail::getShipmentCode,shipmentHeader.getCode())
+					.eq(ShipmentDetail::getWarehouseCode,shipmentHeader.getWarehouseCode());
+			shipmentDetailService.remove(shipmentDetailLambdaQueryWrapper);
 		}
 		return AjaxResult.success("删除成功！");
 	}
@@ -3,6 +3,9 @@ package com.huaheng.pc.shipment.shipmentHeader.service;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.lang.reflect.InvocationTargetException;
+
 public interface ShipmentHeaderService extends IService<ShipmentHeader>{
  
     //新增出库主单
@@ -15,4 +18,6 @@ public interface ShipmentHeaderService extends IService&lt;ShipmentHeader&gt;{
     //根据Id更新这个单据的首尾状态
     AjaxResult updateShipmentStatus(int shipmentId);
  
+    AjaxResult addHistory(ShipmentHeader shipmentHeader) throws InvocationTargetException, IllegalAccessException;
+
 }
 package com.huaheng.pc.shipment.shipmentHeader.service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
+import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
+import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
+import com.huaheng.pc.shipment.shipmentDetailHistory.service.ShipmentDetailHistoryService;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHistoryService;
 import com.huaheng.pc.system.dict.service.IDictDataService;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.lang.reflect.InvocationTargetException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +28,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.mapper.ShipmentHeaderMapper;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import org.springframework.transaction.annotation.Transactional;
+
 @Service
 public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper, ShipmentHeader> implements ShipmentHeaderService{
  
@@ -28,6 +41,11 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
     private ShipmentDetailService shipmentDetailService;
     @Autowired
     private ShipmentContainerHeaderService shipmentContainerHeaderService;
+    @Autowired
+    private ShipmentHeaderHistoryService shipmentHeaderHistoryService;
+    @Autowired
+    private ShipmentDetailHistoryService shipmentDetailHistoryService;
+
  
  
     //新增出库主单
@@ -122,4 +140,33 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         return AjaxResult.success("");
  
     }
+
+    //出库单字段变为历史出库单
+    @Override
+    @Transactional
+    public AjaxResult addHistory(ShipmentHeader shipmentHeader) throws InvocationTargetException, IllegalAccessException {
+        //历史出库主单
+        ShipmentHeaderHistory shipmentHeaderHistory=new ShipmentHeaderHistory();
+        BeanUtils.copyProperties(shipmentHeaderHistory,shipmentHeader);
+        if(shipmentHeaderHistoryService.save(shipmentHeaderHistory)==false){
+            throw new ServiceException("存入历史出库主单失败");
+        }
+        LambdaQueryWrapper<ShipmentDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
+        lambdaQueryWrapper.eq(ShipmentDetail::getWarehouseCode,shipmentHeader.getWarehouseCode())
+                .eq(ShipmentDetail::getShipmentCode,shipmentHeader.getCode());
+        List<ShipmentDetail> shipmentDetails=shipmentDetailService.list(lambdaQueryWrapper);
+
+        //历史出库子单
+        List<ShipmentDetailHistory> shipmentDetailHistories=new ArrayList<>();
+        for(ShipmentDetail item:shipmentDetails){
+            ShipmentDetailHistory shipmentDetailHistory=new ShipmentDetailHistory();
+            BeanUtils.copyProperties(shipmentDetailHistory,item);
+            shipmentDetailHistories.add(shipmentDetailHistory);
+        }
+        Boolean flag=shipmentDetailHistoryService.saveBatch(shipmentDetailHistories);
+        if(flag==false){
+            throw new ServiceException("存入历史出库子单失败");
+        }
+        return null;
+    }
 }
@@ -14,10 +14,10 @@ import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.page.PageDomain;
 import com.huaheng.framework.web.page.TableDataInfo;
 import com.huaheng.framework.web.page.TableSupport;
-import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
-import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
-import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
-import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
+import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
+import com.huaheng.pc.shipment.shipmentDetailHistory.service.ShipmentDetailHistoryService;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHistoryService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -40,14 +40,14 @@ public class ShipmentHeaderHistoryController extends BaseController
     private String prefix = "shipment/shipmentHeaderHistory";
  
 	@Autowired
-	private ShipmentHeaderService shipmentHeaderService;
+	private ShipmentHeaderHistoryService shipmentHeaderHistoryService;
 	@Autowired
-	private ShipmentDetailService shipmentDetailService;
+	private ShipmentDetailHistoryService shipmentDetailHistoryService;
  
  
 	@RequiresPermissions("shipment:bill:view")
 	@GetMapping()
-	public String shipmentHeader()
+	public String shipmentHeaderHistory()
 	{
 	    return prefix + "/shipmentHeaderHistory";
 	}
@@ -56,38 +56,38 @@ public class ShipmentHeaderHistoryController extends BaseController
 	 * 查询出库单主列表
 	 */
 	@RequiresPermissions("shipment:bill:list")
-	@Log(title = "出库-出库单", operating="查看出库主单", action = BusinessType.GRANT)
+	@Log(title = "出库-出库单历史", operating="查看历史出库主单", action = BusinessType.GRANT)
 	@PostMapping("/list")
 	@ResponseBody
-	public TableDataInfo list(ShipmentHeader shipmentHeader,String createdBegin, String createdEnd)
+	public TableDataInfo list(ShipmentHeaderHistory shipmentHeaderHistory, String createdBegin, String createdEnd)
 	{
-		LambdaQueryWrapper<ShipmentHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+		LambdaQueryWrapper<ShipmentHeaderHistory> lambdaQueryWrapper = Wrappers.lambdaQuery();
 		PageDomain pageDomain = TableSupport.buildPageRequest();
 		Integer pageNum = pageDomain.getPageNum();
 		Integer pageSize = pageDomain.getPageSize();
  
-		lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentHeader::getCreated, createdBegin)
-				.le(StringUtils.isNotEmpty(createdEnd), ShipmentHeader::getCreated, createdEnd)
-				.eq(ShipmentHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
-				.eq(ShipmentHeader::getDeleted,true)
-				.in(ShipmentHeader::getCompanyCode,ShiroUtils.getCompanyCodeList())
-				.eq(StringUtils.isNotEmpty(shipmentHeader.getCode()),ShipmentHeader::getCode,shipmentHeader.getCode())
-				.eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()),ShipmentHeader::getShipmentType,shipmentHeader.getShipmentType())
-				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode())
-				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType())
-				.eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus())
-				.eq(shipmentHeader.getLastStatus()!=null, ShipmentHeader::getLastStatus, shipmentHeader.getLastStatus())
-				.orderByDesc(ShipmentHeader::getId);
+		lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin),ShipmentHeaderHistory::getCreated, createdBegin)
+				.le(StringUtils.isNotEmpty(createdEnd), ShipmentHeaderHistory::getCreated, createdEnd)
+				.eq(ShipmentHeaderHistory::getWarehouseCode,ShiroUtils.getWarehouseCode())
+				.eq(ShipmentHeaderHistory::getDeleted,false)
+				.in(ShipmentHeaderHistory::getCompanyCode,ShiroUtils.getCompanyCodeList())
+				.eq(StringUtils.isNotEmpty(shipmentHeaderHistory.getCode()),ShipmentHeaderHistory::getCode,shipmentHeaderHistory.getCode())
+				.eq(StringUtils.isNotEmpty(shipmentHeaderHistory.getShipmentType()),ShipmentHeaderHistory::getShipmentType,shipmentHeaderHistory.getShipmentType())
+				.eq(StringUtils.isNotEmpty(shipmentHeaderHistory.getReferCode()), ShipmentHeaderHistory::getReferCode, shipmentHeaderHistory.getReferCode())
+				.eq(StringUtils.isNotEmpty(shipmentHeaderHistory.getReferCodeType()), ShipmentHeaderHistory::getReferCodeType, shipmentHeaderHistory.getReferCodeType())
+				.eq(shipmentHeaderHistory.getFirstStatus()!=null, ShipmentHeaderHistory::getFirstStatus, shipmentHeaderHistory.getFirstStatus())
+				.eq(shipmentHeaderHistory.getLastStatus()!=null, ShipmentHeaderHistory::getLastStatus, shipmentHeaderHistory.getLastStatus())
+				.orderByDesc(ShipmentHeaderHistory::getId);
  
 		if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
 			/**
 			 * 使用分页查询
 			 */
-			Page<ShipmentHeader> page = new Page<>(pageNum, pageSize);
-			IPage<ShipmentHeader> iPage = shipmentHeaderService.page(page, lambdaQueryWrapper);
+			Page<ShipmentHeaderHistory> page = new Page<>(pageNum, pageSize);
+			IPage<ShipmentHeaderHistory> iPage = shipmentHeaderHistoryService.page(page, lambdaQueryWrapper);
 			return getMpDataTable(iPage.getRecords(),iPage.getTotal());
 		} else {
-			List<ShipmentHeader> list = shipmentHeaderService.list(lambdaQueryWrapper);
+			List<ShipmentHeaderHistory> list = shipmentHeaderHistoryService.list(lambdaQueryWrapper);
 			return getDataTable(list);
 		}
 	}
@@ -97,7 +97,7 @@ public class ShipmentHeaderHistoryController extends BaseController
 	 * 删除出库单主
 	 */
 	@RequiresPermissions("shipment:bill:remove")
-	@Log(title = "出库-出库单", operating="删除出库主单", action = BusinessType.DELETE)
+	@Log(title = "出库-历史出库单", operating="删除历史出库主单", action = BusinessType.DELETE)
 	@PostMapping( "/remove")
 	@ResponseBody
 	public AjaxResult remove(String ids)  {
@@ -105,12 +105,12 @@ public class ShipmentHeaderHistoryController extends BaseController
 			return AjaxResult.error("id不能为空");
 		for (Integer id : Convert.toIntArray(ids))
 		{
-			boolean result=shipmentHeaderService.removeById(id);
-			LambdaQueryWrapper<ShipmentDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
-			lambdaQueryWrapper.eq(ShipmentDetail::getShipmentId,id)
-					.eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
+			boolean result=shipmentHeaderHistoryService.removeById(id);
+			LambdaQueryWrapper<ShipmentDetailHistory> lambdaQueryWrapper=Wrappers.lambdaQuery();
+			lambdaQueryWrapper.eq(ShipmentDetailHistory::getShipmentId,id)
+					.eq(ShipmentDetailHistory::getWarehouseCode,ShiroUtils.getWarehouseCode());
 			Boolean flag=true;
-			flag=shipmentDetailService.remove(lambdaQueryWrapper);
+			flag=shipmentDetailHistoryService.remove(lambdaQueryWrapper);
 			if(flag==false){
 				return AjaxResult.error("删除失败");
 			}
@@ -126,17 +126,17 @@ public class ShipmentHeaderHistoryController extends BaseController
 	 * @return
 	 */
 	@RequiresPermissions("shipment:bill:report")
-	@Log(title = "出库-出库单", operating="打印出库单报表", action = BusinessType.OTHER)
+	@Log(title = "出库-历史出库单", operating="打印历史出库单报表", action = BusinessType.OTHER)
 	@GetMapping("/report/{id}")
 	public String report(@PathVariable("id") Integer id, ModelMap mmap)
 	{
-		ShipmentHeader shipmentHeader = shipmentHeaderService.getById(id);
-		mmap.put("shipmentHeader", shipmentHeader);
+		ShipmentHeaderHistory shipmentHeaderHistory = shipmentHeaderHistoryService.getById(id);
+		mmap.put("shipmentHeader", shipmentHeaderHistory);
  
-		LambdaQueryWrapper<ShipmentDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-		lambdaQueryWrapper.eq(ShipmentDetail::getShipmentId,id)
-				.eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
-		List<ShipmentDetail> details = shipmentDetailService.list(lambdaQueryWrapper);
+		LambdaQueryWrapper<ShipmentDetailHistory> lambdaQueryWrapper = Wrappers.lambdaQuery();
+		lambdaQueryWrapper.eq(ShipmentDetailHistory::getShipmentId,id)
+				.eq(ShipmentDetailHistory::getWarehouseCode,ShiroUtils.getWarehouseCode());
+		List<ShipmentDetailHistory> details = shipmentDetailHistoryService.list(lambdaQueryWrapper);
 		mmap.put("details", details);
  
 		return prefix + "/report";
@@ -144,8 +144,8 @@ public class ShipmentHeaderHistoryController extends BaseController
  
 	@PostMapping("/getShipmentHeader")
 	@ResponseBody
-	public AjaxResult<ShipmentHeader> getShipmentHeader(int id){
-		return AjaxResult.success(shipmentHeaderService.getById(id));
+	public AjaxResult<ShipmentHeaderHistory> getShipmentHeader(int id){
+		return AjaxResult.success(shipmentHeaderHistoryService.getById(id));
 	}
  
  
+package com.huaheng.pc.shipment.shipmentHeaderHistory.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value = "com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory")
+@Data
+@TableName(value = "shipment_header_history")
+public class ShipmentHeaderHistory implements Serializable {
+    /**
+     * 出库单内部号
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "出库单内部号")
+    private Integer id;
+
+    /**
+     * 仓库
+     */
+    @TableField(value = "warehouseCode")
+    @ApiModelProperty(value = "仓库")
+    private String warehouseCode;
+
+    /**
+     * 货主
+     */
+    @TableField(value = "companyCode")
+    @ApiModelProperty(value = "货主")
+    private String companyCode;
+
+
+
+    /**
+     * 出库单号
+     */
+    @TableField(value = "code")
+    @ApiModelProperty(value = "出库单号")
+    private String code;
+
+    /**
+     * erp订单号
+     */
+    @TableField(value = "referCode")
+    @ApiModelProperty(value = "erp订单号")
+    private String referCode;
+
+    /**
+     * erp订单类型
+     */
+    @TableField(value = "referCodeType")
+    @ApiModelProperty(value = "erp订单类型")
+    private String referCodeType;
+
+    /**
+     * erp订单内部号
+     */
+    @TableField(value = "referId")
+    @ApiModelProperty(value = "erp订单内部号")
+    private Integer referId;
+
+    /**
+     * 订单平台
+     */
+    @TableField(value = "referPlatform")
+    @ApiModelProperty(value = "订单平台")
+    private Integer referPlatform;
+
+    /**
+     * 主状态
+     */
+    @TableField(value = "firstStatus")
+    @ApiModelProperty(value = "主状态")
+    private Integer firstStatus;
+
+    /**
+     * 拖状态
+     */
+    @TableField(value = "lastStatus")
+    @ApiModelProperty(value = "拖状态")
+    private Integer lastStatus;
+
+    /**
+     * 出库单类型
+     */
+    @TableField(value = "shipmentType")
+    @ApiModelProperty(value = "出库单类型")
+    private String shipmentType;
+
+    /**
+     * 路线
+     */
+    @TableField(value = "route")
+    @ApiModelProperty(value = "路线")
+    private String route;
+
+    /**
+     * 客户编号
+     */
+    @TableField(value = "customerCode")
+    @ApiModelProperty(value = "客户编号")
+    private String customerCode;
+
+    /**
+     * 客户名称
+     */
+    @TableField(value = "customerName")
+    @ApiModelProperty(value = "客户名称")
+    private String customerName;
+
+    /**
+     * 优先级
+     */
+    @TableField(value = "priority")
+    @ApiModelProperty(value = "优先级")
+    private Integer priority;
+
+    /**
+     * 要求到货时间
+     */
+    @TableField(value = "requestedDeliveryDate")
+    @ApiModelProperty(value = "要求到货时间")
+    private Date requestedDeliveryDate;
+
+
+
+    /**
+     * 计划发车日期
+     */
+    @TableField(value = "scheduledShipDate")
+    @ApiModelProperty(value = "计划发车日期")
+    private Date scheduledShipDate;
+
+    /**
+     * 实际发车时间
+     */
+    @TableField(value = "actualShipDateTime")
+    @ApiModelProperty(value = "实际发车时间")
+    private Date actualShipDateTime;
+
+    /**
+     * 实际到货时间
+     */
+    @TableField(value = "actualDeliveryDate")
+    @ApiModelProperty(value = "实际到货时间")
+    private Date actualDeliveryDate;
+
+    /**
+     * 配送要求
+     */
+    @TableField(value = "deliveryNote")
+    @ApiModelProperty(value = "配送要求")
+    private String deliveryNote;
+
+    /**
+     * 失败原因
+     */
+    @TableField(value = "rejectionNote")
+    @ApiModelProperty(value = "失败原因")
+    private String rejectionNote;
+
+    /**
+     * 波次号
+     */
+    @TableField(value = "waveId")
+    @ApiModelProperty(value = "波次号")
+    private Integer waveId;
+
+    /**
+     * 发货月台
+     */
+    @TableField(value = "shipDock")
+    @ApiModelProperty(value = "发货月台")
+    private String shipDock;
+
+    /**
+     * 分配完成
+     */
+    @TableField(value = "allocateComplete")
+    @ApiModelProperty(value = "分配完成")
+    private Integer allocateComplete;
+
+    /**
+     * 总重量
+     */
+    @TableField(value = "totalWeight")
+    @ApiModelProperty(value = "总重量")
+    private BigDecimal totalWeight;
+
+    /**
+     * 总数量
+     */
+    @TableField(value = "totalQty")
+    @ApiModelProperty(value = "总数量")
+    private BigDecimal totalQty;
+
+    /**
+     * 总体积
+     */
+    @TableField(value = "totalVolume")
+    @ApiModelProperty(value = "总体积")
+    private BigDecimal totalVolume;
+
+    /**
+     * 总行数
+     */
+    @TableField(value = "totalLines")
+    @ApiModelProperty(value = "总行数")
+    private Integer totalLines;
+
+
+
+    /**
+     * 处理类型
+     */
+    @TableField(value = "processType")
+    @ApiModelProperty(value = "处理类型")
+    private String processType;
+
+    /**
+     * 上次波次号
+     */
+    @TableField(value = "lastWaveId")
+    @ApiModelProperty(value = "上次波次号")
+    private Integer lastWaveId;
+
+    /**
+     * 特征值
+     */
+    @TableField(value = "signValue")
+    @ApiModelProperty(value = "特征值")
+    private String signValue;
+
+    /**
+     * 承运人
+     */
+    @TableField(value = "carrierCode")
+    @ApiModelProperty(value = "承运人")
+    private String carrierCode;
+
+    /**
+     * 承运人服务商
+     */
+    @TableField(value = "carrierService")
+    @ApiModelProperty(value = "承运人服务商")
+    private String carrierService;
+
+    /**
+     * 订单备注
+     */
+    @TableField(value = "shipmentNote")
+    @ApiModelProperty(value = "订单备注")
+    private String shipmentNote;
+
+    /**
+     * 承运商编码
+     */
+    @TableField(value = "carrierServer")
+    @ApiModelProperty(value = "承运商编码")
+    private String carrierServer;
+
+    /**
+     * 承运商名称
+     */
+    @TableField(value = "carrierServerName")
+    @ApiModelProperty(value = "承运商名称")
+    private String carrierServerName;
+
+    /**
+     * 车牌号
+     */
+    @TableField(value = "plateNumber")
+    @ApiModelProperty(value = "车牌号")
+    private String plateNumber;
+
+    /**
+     * 车型
+     */
+    @TableField(value = "carModel")
+    @ApiModelProperty(value = "车型")
+    private String carModel;
+
+    /**
+     * 司机名称
+     */
+    @TableField(value = "driverName")
+    @ApiModelProperty(value = "司机名称")
+    private String driverName;
+
+    /**
+     * 司机联系方式
+     */
+    @TableField(value = "driverTel")
+    @ApiModelProperty(value = "司机联系方式")
+    private String driverTel;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "created")
+    @ApiModelProperty(value = "创建时间")
+    private Date created;
+
+    /**
+     * 创建用户
+     */
+    @TableField(value = "createdBy")
+    @ApiModelProperty(value = "创建用户")
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "lastUpdated")
+    @ApiModelProperty(value = "创建时间")
+    private Date lastUpdated;
+
+    /**
+     * 更新用户
+     */
+    @TableField(value = "lastUpdatedBy")
+    @ApiModelProperty(value = "更新用户")
+    private String lastUpdatedBy;
+
+    /**
+     * 数据版本
+     */
+    @TableField(value = "version")
+    @ApiModelProperty(value = "数据版本")
+    private Integer version;
+
+    /**
+     * 自定义字段1
+     */
+    @TableField(value = "userDef1")
+    @ApiModelProperty(value = "自定义字段1")
+    private String userDef1;
+
+    /**
+     * 自定义字段2
+     */
+    @TableField(value = "userDef2")
+    @ApiModelProperty(value = "自定义字段2")
+    private String userDef2;
+
+    /**
+     * 自定义字段3
+     */
+    @TableField(value = "userDef3")
+    @ApiModelProperty(value = "自定义字段3")
+    private String userDef3;
+    /**
+     * 处理标记
+     */
+    @TableField(value = "processStamp")
+    @ApiModelProperty(value = "处理标记")
+    private String processStamp;
+
+    /**
+     * 是否删除
+     */
+    @TableField(value = "deleted")
+    @ApiModelProperty(value = "是否删除")
+    private Boolean deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String COL_WAREHOUSECODE = "warehouseCode";
+
+    public static final String COL_COMPANYCODE = "companyCode";
+
+    public static final String COL_CODE = "code";
+
+    public static final String COL_REFERCODE = "referCode";
+
+    public static final String COL_REFERCODETYPE = "referCodeType";
+
+    public static final String COL_REFERID = "referId";
+
+    public static final String COL_REFERPLATFORM = "referPlatform";
+
+    public static final String COL_FIRSTSTATUS = "firstStatus";
+
+    public static final String COL_LASTSTATUS = "lastStatus";
+
+    public static final String COL_SHIPMENTTYPE = "shipmentType";
+
+    public static final String COL_ROUTE = "route";
+
+    public static final String COL_CUSTOMERCODE = "customerCode";
+
+    public static final String COL_CUSTOMERNAME = "customerName";
+
+    public static final String COL_PRIORITY = "priority";
+
+    public static final String COL_REQUESTEDDELIVERYDATE = "requestedDeliveryDate";
+
+    public static final String COL_SCHEDULEDSHIPDATE = "scheduledShipDate";
+
+    public static final String COL_ACTUALSHIPDATETIME = "actualShipDateTime";
+
+    public static final String COL_ACTUALDELIVERYDATE = "actualDeliveryDate";
+
+    public static final String COL_DELIVERYNOTE = "deliveryNote";
+
+    public static final String COL_REJECTIONNOTE = "rejectionNote";
+
+    public static final String COL_WAVEID = "waveId";
+
+    public static final String COL_SHIPDOCK = "shipDock";
+
+    public static final String COL_ALLOCATECOMPLETE = "allocateComplete";
+
+    public static final String COL_TOTALWEIGHT = "totalWeight";
+
+    public static final String COL_TOTALQTY = "totalQty";
+
+    public static final String COL_TOTALVOLUME = "totalVolume";
+
+    public static final String COL_TOTALLINES = "totalLines";
+
+    public static final String COL_PROCESSTYPE = "processType";
+
+    public static final String COL_LASTWAVEID = "lastWaveId";
+
+    public static final String COL_SIGNVALUE = "signValue";
+
+    public static final String COL_CARRIERCODE = "carrierCode";
+
+    public static final String COL_CARRIERSERVICE = "carrierService";
+
+    public static final String COL_SHIPMENTNOTE = "shipmentNote";
+
+    public static final String COL_CARRIERSERVER = "carrierServer";
+
+    public static final String COL_CARRIERSERVERNAME = "carrierServerName";
+
+    public static final String COL_PLATENUMBER = "plateNumber";
+
+    public static final String COL_CARMODEL = "carModel";
+
+    public static final String COL_DRIVERNAME = "driverName";
+
+    public static final String COL_DRIVERTEL = "driverTel";
+
+    public static final String COL_CREATED = "created";
+
+    public static final String COL_CREATEDBY = "createdBy";
+
+    public static final String COL_LASTUPDATED = "lastUpdated";
+
+    public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
+
+    public static final String COL_VERSION = "version";
+
+    public static final String COL_USERDEF1 = "userDef1";
+
+    public static final String COL_USERDEF2 = "userDef2";
+
+    public static final String COL_USERDEF3 = "userDef3";
+
+    public static final String COL_PROCESSSTAMP = "processStamp";
+
+    public static final String COL_DELETED = "deleted";
+}
 \ No newline at end of file
+package com.huaheng.pc.shipment.shipmentHeaderHistory.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
+
+public interface ShipmentHeaderHistoryMapper extends BaseMapper<ShipmentHeaderHistory> {
+
+
+
+}
 \ No newline at end of file
+package com.huaheng.pc.shipment.shipmentHeaderHistory.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
+
+public interface ShipmentHeaderHistoryService extends IService<ShipmentHeaderHistory>{
+
+
+}
+package com.huaheng.pc.shipment.shipmentHeaderHistory.service;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
+import com.huaheng.pc.shipment.shipmentHeaderHistory.mapper.ShipmentHeaderHistoryMapper;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class ShipmentHeaderHistoryServiceImpl extends ServiceImpl<ShipmentHeaderHistoryMapper, ShipmentHeaderHistory> implements ShipmentHeaderHistoryService {
+
+}
+<?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.huaheng.pc.config.materialType.mapper.MaterialTypeMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.config.materialType.domain.MaterialType">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
+    <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
+    <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
+    <result column="shippingFlow" jdbcType="VARCHAR" property="shippingFlow" />
+    <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
+    <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
+    <result column="replenishmentRule" jdbcType="VARCHAR" property="replenishmentRule" />
+    <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
+    <result column="pickingRule" jdbcType="VARCHAR" property="pickingRule" />
+    <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
+    <result column="trackSerialNum" jdbcType="INTEGER" property="trackSerialNum" />
+    <result column="autoGenSerialNum" jdbcType="INTEGER" property="autoGenSerialNum" />
+    <result column="autoGenSerialNumFormat" jdbcType="VARCHAR" property="autoGenSerialNumFormat" />
+    <result column="snTemplateCode" jdbcType="VARCHAR" property="snTemplateCode" />
+    <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
+    <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
+    <result column="enable" jdbcType="INTEGER" property="enable" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, `name`, companyCode, warehouseCode, abcClass, daysToExpire, receivingFlow, 
+    shippingFlow, locatingRule, allocationRule, replenishmentRule, emptyLocRule, pickingRule, 
+    attributeTemplateCode, trackSerialNum, autoGenSerialNum, autoGenSerialNumFormat, 
+    snTemplateCode, expiringDays, minShelfLifeDays, `enable`, created, createdBy, lastUpdated, 
+    lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, 
+    userDef7, userDef8
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.inventory.adjustDetail.mapper.AdjustDetailMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="adjustCode" jdbcType="VARCHAR" property="adjustCode" />
+    <result column="cycleCountCode" jdbcType="VARCHAR" property="cycleCountCode" />
+    <result column="cycleDetailId" jdbcType="INTEGER" property="cycleDetailId" />
+    <result column="checkCode" jdbcType="VARCHAR" property="checkCode" />
+    <result column="checkDetailId" jdbcType="VARCHAR" property="checkDetailId" />
+    <result column="referCode" jdbcType="VARCHAR" property="referCode" />
+    <result column="referDetailId" jdbcType="INTEGER" property="referDetailId" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
+    <result column="materialName" jdbcType="VARCHAR" property="materialName" />
+    <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
+    <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="problemType" jdbcType="VARCHAR" property="problemType" />
+    <result column="attributeId" jdbcType="INTEGER" property="attributeId" />
+    <result column="fromInventorySts" jdbcType="VARCHAR" property="fromInventorySts" />
+    <result column="toInventorySts" jdbcType="VARCHAR" property="toInventorySts" />
+    <result column="fromQty" jdbcType="INTEGER" property="fromQty" />
+    <result column="toQty" jdbcType="INTEGER" property="toQty" />
+    <result column="gapQty" jdbcType="INTEGER" property="gapQty" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="agreeBy" jdbcType="VARCHAR" property="agreeBy" />
+    <result column="agreeTime" jdbcType="TIMESTAMP" property="agreeTime" />
+    <result column="Remark" jdbcType="VARCHAR" property="remark" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, adjustCode, cycleCountCode, cycleDetailId, checkCode, checkDetailId, referCode,
+    referDetailId, warehouseCode, companyCode, materialCode, materialName,
+    materialSpec, materialUnit, problemType, attributeId, fromInventorySts, toInventorySts, 
+    fromQty, toQty, gapQty, `status`, created, createdBy, agreeTime, Remark,
+    version, userDef1, userDef2, userDef3, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.inventory.adjustHeader.mapper.AdjustHeaderMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.adjustHeader.domain.AdjustHeader">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="problemType" jdbcType="VARCHAR" property="problemType" />
+    <result column="cycleCountCode" jdbcType="VARCHAR" property="cycleCountCode" />
+    <result column="checkCode" jdbcType="VARCHAR" property="checkCode" />
+    <result column="referCode" jdbcType="VARCHAR" property="referCode" />
+    <result column="referReason" jdbcType="VARCHAR" property="referReason" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, code, warehouseCode, companyCode, problemType, cycleCountCode, checkCode,
+    referCode, referReason, createdBy, created, version, userDef1, userDef2, userDef3, processStamp
+  </sql>
+</mapper>
 \ No newline at end of file
@@ -20,7 +20,7 @@
     <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
     <result column="systemQty" jdbcType="DECIMAL" property="systemQty" />
     <result column="countedQty" jdbcType="DECIMAL" property="countedQty" />
-    <result column="adjustQty" jdbcType="DECIMAL" property="adjustQty" />
+    <result column="gapQty" jdbcType="DECIMAL" property="gapQty" />
     <result column="rejectionNote" jdbcType="VARCHAR" property="rejectionNote" />
     <result column="countedBy" jdbcType="VARCHAR" property="countedBy" />
     <result column="countedAt" jdbcType="TIMESTAMP" property="countedAt" />
@@ -46,7 +46,7 @@
     <!--@mbg.generated-->
     id, countId, round, taskHeaderId, taskDetailId, warehouseCode, inventoryDetailId, 
     locationCode, containerCode, materialCode, materialName, materialSpec, materialUnit, 
-    companyCode, inventorySts, systemQty, countedQty, adjustQty, rejectionNote, countedBy, 
+    companyCode, inventorySts, systemQty, countedQty, gapQty, rejectionNote, countedBy,
     countedAt, assignedTo, assignedAt, completedBy, completedAt, enableStatus, created, 
     createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, processStamp, 
     batch, lot, projectNo
@@ -13,10 +13,10 @@
     <result column="materialName" jdbcType="VARCHAR" property="materialName" />
     <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
     <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
-    <result column="qty" jdbcType="INTEGER" property="qty" />
+    <result column="taskQty" jdbcType="INTEGER" property="taskQty" />
     <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
     <result column="referCode" jdbcType="VARCHAR" property="referCode" />
-    <result column="referId" jdbcType="VARCHAR" property="referId" />
+    <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" />
     <result column="referDetailId" jdbcType="VARCHAR" property="referDetailId" />
     <result column="batch" jdbcType="VARCHAR" property="batch" />
     <result column="lot" jdbcType="VARCHAR" property="lot" />
@@ -30,31 +30,22 @@
     <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
     <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
     <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
-    <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
     <result column="lockCode" jdbcType="VARCHAR" property="lockCode" />
-    <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" />
     <result column="created" jdbcType="TIMESTAMP" property="created" />
     <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
-    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
-    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
     <result column="version" jdbcType="INTEGER" property="version" />
     <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
     <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
     <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
-    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
-    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
-    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
-    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
-    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
     <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, warehouseCode, companyCode, locationCode, containerCode, transactionType, materialCode, 
-    materialName, materialSpec, materialUnit, qty, inventorySts, referCode, referId, 
+    materialName, materialSpec, materialUnit, taskQty, inventorySts, referCode, referDetailId,
     referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate, expirationDate, 
-    agingDate, attributeId, attribute1, attribute2, attribute3, attribute4, lockCode, 
-    lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, 
-    userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+    agingDate, attributeId, attribute1, attribute2, attribute3, lockCode,
+    created, createdBy, version, userDef1,
+    userDef2, userDef3, processStamp
   </sql>
 </mapper>
 \ No newline at end of file
+<?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.huaheng.pc.receipt.receiptDetailHistory.mapper.ReceiptDetailHistoryMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="receiptId" jdbcType="INTEGER" property="receiptId" />
+    <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
+    <result column="materialName" jdbcType="VARCHAR" property="materialName" />
+    <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
+    <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
+    <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" />
+    <result column="batch" jdbcType="VARCHAR" property="batch" />
+    <result column="lot" jdbcType="VARCHAR" property="lot" />
+    <result column="qcCheck" jdbcType="VARCHAR" property="qcCheck" />
+    <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
+    <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" />
+    <result column="expirationDate" jdbcType="DATE" property="expirationDate" />
+    <result column="agingDate" jdbcType="DATE" property="agingDate" />
+    <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
+    <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
+    <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
+    <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
+    <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
+    <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
+    <result column="openQty" jdbcType="INTEGER" property="openQty" />
+    <result column="referCode" jdbcType="VARCHAR" property="referCode" />
+    <result column="referId" jdbcType="INTEGER" property="referId" />
+    <result column="referLineNum" jdbcType="VARCHAR" property="referLineNum" />
+    <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
+    <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
+    <result column="itemListPrice" jdbcType="DECIMAL" property="itemListPrice" />
+    <result column="itemNetPrice" jdbcType="DECIMAL" property="itemNetPrice" />
+    <result column="isVirtualBom" jdbcType="INTEGER" property="isVirtualBom" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, receiptId, receiptCode, warehouseCode, companyCode, materialCode, materialName, 
+    materialSpec, materialUnit, supplierCode, batch, lot, qcCheck, projectNo, manufactureDate, 
+    expirationDate, agingDate, attributeTemplateCode, attribute1, attribute2, attribute3, 
+    attribute4, totalQty, openQty, referCode, referId, referLineNum, locatingRule, inventorySts, 
+    itemListPrice, itemNetPrice, isVirtualBom, created, createdBy, lastUpdated, lastUpdatedBy, 
+    version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 
+    processStamp, deleted
+  </sql>
+</mapper>
 \ No newline at end of file
+<?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.huaheng.pc.receipt.receiptHeaderHistory.mapper.ReceiptHeaderHistoryMapper">
+  <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory">
+    <!--@mbg.generated-->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
+    <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
+    <result column="code" jdbcType="VARCHAR" property="code" />
+    <result column="receiptType" jdbcType="VARCHAR" property="receiptType" />
+    <result column="firstStatus" jdbcType="INTEGER" property="firstStatus" />
+    <result column="lastStatus" jdbcType="INTEGER" property="lastStatus" />
+    <result column="referCode" jdbcType="VARCHAR" property="referCode" />
+    <result column="referId" jdbcType="INTEGER" property="referId" />
+    <result column="referType" jdbcType="VARCHAR" property="referType" />
+    <result column="scheduledArriveDate" jdbcType="DATE" property="scheduledArriveDate" />
+    <result column="actualArriveDate" jdbcType="DATE" property="actualArriveDate" />
+    <result column="recvDock" jdbcType="VARCHAR" property="recvDock" />
+    <result column="closedAt" jdbcType="DATE" property="closedAt" />
+    <result column="closedBy" jdbcType="VARCHAR" property="closedBy" />
+    <result column="startCheckinDatetime" jdbcType="TIMESTAMP" property="startCheckinDatetime" />
+    <result column="endCheckinDatetime" jdbcType="TIMESTAMP" property="endCheckinDatetime" />
+    <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
+    <result column="totalLines" jdbcType="INTEGER" property="totalLines" />
+    <result column="toalCases" jdbcType="INTEGER" property="toalCases" />
+    <result column="totalWeight" jdbcType="DECIMAL" property="totalWeight" />
+    <result column="totalVolume" jdbcType="DECIMAL" property="totalVolume" />
+    <result column="receiptNote" jdbcType="VARCHAR" property="receiptNote" />
+    <result column="locked" jdbcType="INTEGER" property="locked" />
+    <result column="lockedBy" jdbcType="VARCHAR" property="lockedBy" />
+    <result column="created" jdbcType="TIMESTAMP" property="created" />
+    <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
+    <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
+    <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
+    <result column="version" jdbcType="INTEGER" property="version" />
+    <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
+    <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
+    <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
+    <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
+    <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
+    <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
+    <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
+    <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+    <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+    <result column="deleted" jdbcType="BIT" property="deleted" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, warehouseCode, companyCode, code, receiptType, firstStatus, lastStatus, referCode, 
+    referId, referType, scheduledArriveDate, actualArriveDate, recvDock, closedAt, closedBy, 
+    startCheckinDatetime, endCheckinDatetime, totalQty, totalLines, toalCases, totalWeight, 
+    totalVolume, receiptNote, locked, lockedBy, created, createdBy, lastUpdated, lastUpdatedBy, 
+    version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, 
+    processStamp, deleted
+  </sql>
+</mapper>
 \ No newline at end of file