质量手持更新

op-modules/op-open/src/main/java/com/op/open/service/impl/OpenServiceImpl.java

@@ -306,6 +306,7 @@ public class OpenServiceImpl implements OpenService {
         // 1分钟不允许存在两条
         Date lastData = openMapper.getLastTask(qcCheckTaskProduce);
         if(this.oneMinHas(lastData)){
+            logger.info("【重复创建首检任务】orderNo:"+qcCheckTaskProduce.getOrderNo()+";"+"incomeBatchNo:"+qcCheckTaskProduce.getIncomeBatchNo());
             return 0;
         }
 

op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckTypeProject.java

@@ -110,6 +110,15 @@ public class QcCheckTypeProject extends BaseEntity {
     private String checkTool;
     private String checkMode;
     private String unit;
+    private String weight;
+
+    public String getWeight() {
+        return weight;
+    }
+
+    public void setWeight(String weight) {
+        this.weight = weight;
+    }
 
     public String getUnit() {
         return unit;

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckTaskWarehousingServiceImpl.java

@@ -106,7 +106,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 	 * @return 结果
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	//@Transactional(rollbackFor = Exception.class)不能加
+	@DS("#header.poolName")
 	public int insertQcCheckTaskWarehousing(QcCheckTaskWarehousing qcCheckTaskWarehousing) {
 
 		if(StringUtils.isNotBlank(qcCheckTaskWarehousing.getFactoryCode())){

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTaskProduceMapper.xml

@@ -434,8 +434,8 @@
         left join base_equipment be on be.equipment_code = pow.workorder_name and be.equipment_type_code = 'equ_type_bzx'
         where pow.del_flag = '0'
           and pow.status = 'w2' and pow.parent_order = '0'
-          and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120)
+          <!--and (pow.product_date = CONVERT(varchar(10),GETDATE(), 120)
-                   or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
+                   or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))-->
     </select>
     <select id="getLastXJTask" resultType="com.op.quality.domain.QcCheckTaskProduce">
         select top 1

op-modules/op-quality/src/main/resources/mapper/quality/QcCheckTypeProjectMapper.xml

@@ -28,6 +28,7 @@
         <result property="ruleName" column="rule_name"/>
         <result property="sort" column="sort"/>
         <result property="projectNo" column="project_no"/>
+        <result property="weight" column="weight"/>
 
     </resultMap>
 
@@ -40,28 +41,11 @@
 
     <select id="selectQcCheckTypeProjectList" parameterType="QcCheckTypeProject" resultMap="QcCheckTypeProjectResult">
         SELECT
-        ctp.id,
+        ctp.id,ctp.project_no,ctp.project_id,
-        ctp.project_no,
+        cp.rule_name,cp.property_code,cp.unit_code unit,ctp.type_id,
-        ctp.project_id,
+        ctp.standard_value,ctp.upper_diff,ctp.down_diff,ctp.sample,ctp.status,
-        cp.rule_name,
+        ctp.create_by, ctp.create_time,ctp.update_by,ctp.update_time,
-        cp.property_code,
+        ctp.factory_code, ctp.del_flag,ctp.group_id,ctp.material_code,ctp.sample_num,ctp.sort
-        cp.unit_code unit,
-        ctp.type_id,
-        ctp.standard_value,
-        ctp.upper_diff,
-        ctp.down_diff,
-        ctp.sample,
-        ctp.status,
-        ctp.create_by,
-        ctp.create_time,
-        ctp.update_by,
-        ctp.update_time,
-        ctp.factory_code,
-        ctp.del_flag,
-        ctp.group_id,
-        ctp.material_code,
-        ctp.sample_num,
-        ctp.sort
         FROM qc_check_type_project ctp
         LEFT JOIN qc_check_project cp ON ctp.project_id = cp.id
         <where>
@@ -85,26 +69,16 @@
 
     <select id="selectQcCheckTypeProjectById" parameterType="String" resultMap="QcCheckTypeProjectResult">
 		SELECT
-			ctp.id,
+			ctp.id,ctp.project_id,
-			ctp.project_id,
+			cp.rule_name,cp.property_code,
-			cp.rule_name,
+			ctp.type_id,ctp.standard_value,
-			cp.property_code,
+			ctp.upper_diff,ctp.down_diff,
-			ctp.type_id,
+			ctp.sample,ctp.status,
-			ctp.standard_value,
+			ctp.create_by,ctp.create_time,
-			ctp.upper_diff,
+			ctp.update_by,ctp.update_time,
-			ctp.down_diff,
+			ctp.factory_code,ctp.del_flag,
-			ctp.sample,
+			ctp.group_id,ctp.material_code,
-			ctp.status,
+			ctp.sample_num,ctp.sort,ctp.weight
-			ctp.create_by,
-			ctp.create_time,
-			ctp.update_by,
-			ctp.update_time,
-			ctp.factory_code,
-			ctp.del_flag,
-			ctp.group_id,
-			ctp.material_code,
-			ctp.sample_num,
-			ctp.sort
 		FROM qc_check_type_project ctp
 		LEFT JOIN qc_check_project cp ON ctp.project_id = cp.id AND cp.del_flag = '0'
 		WHERE ctp.del_flag ='0' AND ctp.id = #{id}
@@ -279,6 +253,7 @@
             <if test="unit != null">unit = #{unit},</if>
             <if test="propertyCode != null">property_code = #{propertyCode},</if>
             <if test="sort != null">sort = #{sort},</if>
+            <if test="weight != null">weight = #{weight},</if>
         </trim>
         where id = #{id}
     </update>