钎样

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -129,6 +129,7 @@ public enum StatusEnum {
     COMPLEX_INSPECTED("2", "已复检", "complex inspected"),
     WEIGHED_GROSS_WEIGHT("3", "已称毛重", "weighedgrossweight"),
     TARED("5", "已称皮重", "tared"),
+    TO_BE_INSPECTED("7", "待初检", "to_be_inspected"),
 
     //付款管理状态
     TO_BE_SETTLED("1", "待结算", "to_be_settled"),

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

@@ -253,6 +253,10 @@ public class QualityInspectionManagement extends BaseModel<QualityInspectionMana
      * 原箱直销（1直销）
      */
     private String defaultBox;
+    /**
+     * 仅为钎样员（1是）
+     */
+    private String brazer;
     /**
      * 出入库任务编号
      */

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

@@ -223,6 +223,10 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
                 weighingManagementService.updateById(weighingManagement);
             }
         }
+        //钎样
+        else if ("3".equals(qualityInspectionManagement.getFlag())){
+            this.updateById(qualityInspectionManagement);
+        }
         if(qualityInspectionManagement.getCost() == null){
             qualityInspectionManagement.setCost(Float.parseFloat((qualityInspectionManagement.getDryGrainPrice()==null?0:qualityInspectionManagement.getDryGrainPrice())*1000 + ""));
         }
@@ -367,9 +371,16 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         qualityInspectionManagement.setQualityDate(new Date());
         CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
         qualityInspectionManagement.setQualityInspector(commonStaff.getStaffName());
-        //状态为已初检
-        qualityInspectionManagement.setStatus(StatusEnum.FIRST_INSPECTED.getName());
-        qualityInspectionManagement.setStatusFlag(StatusEnum.FIRST_INSPECTED.getFlag());
+        //钎样员提交，状态为待初检
+        if ("1".equals(qualityInspectionManagement.getBrazer())) {
+            qualityInspectionManagement.setStatus(StatusEnum.TO_BE_INSPECTED.getName());
+            qualityInspectionManagement.setStatusFlag(StatusEnum.TO_BE_INSPECTED.getFlag());
+        }
+        //质检员或双重身份提交，状态为已初检
+        else {
+            qualityInspectionManagement.setStatus(StatusEnum.FIRST_INSPECTED.getName());
+            qualityInspectionManagement.setStatusFlag(StatusEnum.FIRST_INSPECTED.getFlag());
+        }
         qualityInspectionManagement.setAgentKey(AuthSecurityUtils.getCurrentUserId());
         qualityInspectionManagement.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
         CommonSysParameter commonSysParameter = iCommonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", qualityInspectionManagement.getGoodsName()));

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

@@ -22,12 +22,19 @@
             AND q.service_management_type = #{serviceManagementType}
         </if>
         <if test="statusType != null and statusType != ''">
+            <!-- 初检-->
+            <if test="statusType == 0">
+                AND q.status_flag='7'
+            </if>
+            <!-- 未复检-->
             <if test="statusType == 1">
                 AND (q.status_flag='0' and q.confirm='0')
             </if>
+            <!-- 已复检-->
             <if test="statusType == 2">
                 AND (q.status_flag='2' and q.confirm='0')
             </if>
+            <!-- 已确认-->
             <if test="statusType == 3">
                 AND (q.status_flag='2' and q.confirm='1')
             </if>
@@ -104,12 +111,19 @@
             AND q.service_management_type = #{serviceManagementType}
         </if>
         <if test="statusType != null and statusType != ''">
+            <!-- 初检-->
+            <if test="statusType == 0">
+                AND q.status_flag='7'
+            </if>
+            <!-- 未复检-->
             <if test="statusType == 1">
                 AND (q.status_flag='0' and q.confirm='0')
             </if>
+            <!-- 已复检-->
             <if test="statusType == 2">
                 AND (q.status_flag='2' and q.confirm='0')
             </if>
+            <!-- 已确认-->
             <if test="statusType == 3">
                 AND (q.status_flag='2' and q.confirm='1')
             </if>