差异管理添加状态待过账、重盘、已过账；

mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/entity/DifferentManage.java

@@ -111,6 +111,10 @@ public class DifferentManage extends BaseVOEntity {
     @Excel(name = "是否重盘: 1-是 2-否")
     private Integer reCountedFlag;
 
+    @ApiModelProperty("盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    @Excel(name = "盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    private Integer inventoryDiscrepancyStatus;
+
     @ApiModelProperty("盘点详情")
     @TableField(exist = false)
     private List<InvestigetionManageDetail> investigetionManageDetailList;

mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/persistence/DifferentManageImpl.java

@@ -123,6 +123,8 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
         // 生成新的盘点单
         // 查询差异单
         DifferentManage differentManage = differentManageMapper.selectById(differentManageDO.getDifferentManageId());
+        differentManage.setInventoryDiscrepancyStatus(2);
+        differentManageMapper.updateById(differentManage);
         if(null == differentManage){
             throw new ServiceException("抱歉，没有找到此差异单信息！");
         }
@@ -246,6 +248,8 @@ public class DifferentManageImpl extends ServiceImpl<DifferentManageMapper, Diff
     @Override
     public DifferentManagePO getDifferentManageDO(Long differentManageId) {
         DifferentManage differentManage = differentManageMapper.selectById(differentManageId);
+        differentManage.setInventoryDiscrepancyStatus(3);
+        differentManageMapper.updateById(differentManage);
         String investigationNumber = differentManage.getInvestigationNumber();
         List<InvestigetionManageDetail> investigetionManageDetails = investigetionManageDetailMapper.selectList(new QueryWrapper<InvestigetionManageDetail>().lambda().eq(InvestigetionManageDetail::getInvestigationNumber, investigationNumber));
         List<InvestigetionManageDetail> investigetionManageDetailList = new ArrayList<>();

mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/po/DifferentManagePO.java

@@ -110,6 +110,10 @@ public class DifferentManagePO extends BaseVOEntity {
     @Excel(name = "是否重盘: 1-是 2-否")
     private Integer reCountedFlag;
 
+    @ApiModelProperty("盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    @Excel(name = "盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    private Integer inventoryDiscrepancyStatus;
+
     @ApiModelProperty("盘点详情")
     @TableField(exist = false)
     private List<InvestigetionManageDetailPO> investigetionManageDetailList;

mhd_wms/src/main/java/com/mhd/wms/domain/differentManage/repository/todo/DifferentManageDO.java

@@ -114,6 +114,10 @@ public class DifferentManageDO extends BaseVOEntity {
     @Excel(name = "是否重盘: 1-是 2-否")
     private Integer reCountedFlag;
 
+    @ApiModelProperty("盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    @Excel(name = "盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    private Integer inventoryDiscrepancyStatus;
+
     @ApiModelProperty("盘点详情")
     @TableField(exist = false)
     private List<InvestigetionManageDetailDO> investigetionManageDetailList;

mhd_wms/src/main/java/com/mhd/wms/domain/investigationManage/repository/persistence/InvestigationManageImpl.java

@@ -377,6 +377,7 @@ public class InvestigationManageImpl extends ServiceImpl<InvestigationManageMapp
                 setWarehouseInfo(differentManage);
             }
             // 基础信息
+            differentManage.setInventoryDiscrepancyStatus(1);
             differentManage.setTopOrganizationId(userPo.getTopOrganizationId());
             differentManage.setOrganizationId(userPo.getOrganizationId());
             differentManage.setOrganizationName(userPo.getOrganizationName());

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/differentManage/DifferentManageDTO.java

@@ -107,6 +107,10 @@ public class DifferentManageDTO extends BaseVOEntity {
     @Excel(name = "是否重盘: 1-是 2-否")
     private Integer reCountedFlag;
 
+    @ApiModelProperty("盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    @Excel(name = "盘点差异状态: 1.待过账、2.重盘、3.已过账")
+    private Integer inventoryDiscrepancyStatus;
+
 
     @ApiModelProperty(name = "组织ID集合")
     private List<Long> organizationIdList;

mhd_wms/src/main/resources/mapper/differentManage/DifferentManageMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectDifferentManagePo">
-        select different_manage_id, organization_id, organization_name, top_organization_id, different_number, investigation_number, investigation_status, investigation_range, investigation_type, investigation_method, investigation_frequency, investigation_man_by, investigation_man_name, operators_by, operators_name, warehouse_id, warehouse_code, warehouse_name, nullify, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name,posted_flag,re_counted_flag, del_flag from different_manage
+        select different_manage_id, organization_id, organization_name, top_organization_id, different_number, investigation_number, investigation_status, investigation_range, investigation_type, investigation_method, investigation_frequency, investigation_man_by, investigation_man_name, operators_by, operators_name, warehouse_id, warehouse_code, warehouse_name, nullify, remark, create_time, create_by, create_by_name, update_time, update_by, update_by_name,posted_flag,re_counted_flag, del_flag,inventoryDiscrepancyStatus from different_manage
     </sql>
 
     <sql id="selectDifferentManagePo1">