出库新增

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/QualityInspectionManagement.java

@@ -381,6 +381,12 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      */
     @TableField(exist = false)
     private String statusType;
+
+    /**
+     * 出库质检状态切换
+     */
+    @TableField(exist = false)
+    private String qualityType;
     @Override
     protected Serializable pkVal() {
         return this.id;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -172,6 +172,46 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date grossDate;
+
+    /**
+     * 出库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date inOutDate;
+    /**
+     * 箱号
+     */
+    private String boxNo;
+    /**
+     * 箱号2
+     */
+    private String boxNoOther;
+    /**
+     * 封号
+     */
+    private String titleNo;
+    /**
+     * 封号2
+     */
+    private String titleNoOther;
+    /**
+     * 出入库类型key
+     */
+    private String inOutTypeKey;
+    /**
+     * 提示
+     */
+    private String tips;
+    /**
+     * 车队
+     */
+    private String fleet;
+    /**
+     * 仓位编号id
+     */
+    private String positionId;
+
     /**
      * 皮重检斤时间
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -69,6 +69,7 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         pageView.put("managementType",qualityInspectionManagement.getManagementType());
         pageView.put("serviceManagementType",qualityInspectionManagement.getServiceManagementType());
         pageView.put("statusType",qualityInspectionManagement.getStatusType());
+        pageView.put("qualityType",qualityInspectionManagement.getQualityType());
 
         // 查询销售订单总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -68,6 +68,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             weighingManagement.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
         }
         pageView.put("compId", weighingManagement.getCompId());
+        pageView.put("number", weighingManagement.getNumber());
         pageView.put("searchKeyWord", weighingManagement.getSearchKeyWord());
         pageView.put("serviceManagementType",weighingManagement.getServiceManagementType());
         pageView.put("startDate", weighingManagement.getStartDate());
@@ -358,7 +359,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         //生成质检信息
         QualityInspectionManagement qualityInspectionManagement = new QualityInspectionManagement();
         qualityInspectionManagement.setId(IdGenerator.generateUUID());
-        qualityInspectionManagement.setRelationId(relationId);
+        qualityInspectionManagement.setRelationId(weighingManagement.getRelationId());
         qualityInspectionManagement.setContractNo(weighingManagement.getContractNo());
         qualityInspectionManagement.setCarNumber(weighingManagement.getCarNumber());
         qualityInspectionManagement.setCompId(weighingManagement.getCompId());
@@ -367,6 +368,7 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         qualityInspectionManagement.setStatus(StatusEnum.TARED.getName());
         qualityInspectionManagement.setStatusFlag(StatusEnum.TARED.getFlag());
         qualityInspectionManagement.setManagementType("3");
+        qualityInspectionManagement.setServiceManagementType(weighingManagement.getServiceManagementType());
         qualityInspectionManagement.setQualityDate(new Date());
         qualityInspectionManagement.setWarehouseName(weighingManagement.getWarehouseName());
         qualityInspectionManagement.setStorageTagNo(weighingManagement.getStorageNumber());

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/QualityInspectionManagementMapper.xml

@@ -32,6 +32,14 @@
                 AND (q.status_flag='2' and q.confirm='1')
             </if>
         </if>
+        <if test="qualityType != null and qualityType != ''">
+            <if test="qualityType == 1">
+                AND status_flag='5'
+            </if>
+            <if test="qualityType == 2">
+                AND status_flag='1'
+            </if>
+        </if>
     </select>
     <!-- 获得质检管理列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -100,6 +108,14 @@
                 AND (q.status_flag='2' and q.confirm='1')
             </if>
         </if>
+        <if test="qualityType != null and qualityType != ''">
+            <if test="qualityType == 1">
+                AND status_flag='5'
+            </if>
+            <if test="qualityType == 2">
+                AND status_flag='1'
+            </if>
+        </if>
         ORDER BY q.status_flag Asc,q.confirm Asc,q.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}