成品检验2.0

op-modules/op-quality/src/main/java/com/op/quality/controller/QcCheckReportProductController.java

@@ -43,15 +43,15 @@ public class QcCheckReportProductController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(QcCheckReportIncome qcCheckReportIncome) {
 
-        //默认时间范围T 00:00:00~T+1 00:00:00
+//        //默认时间范围T 00:00:00~T+1 00:00:00
-        if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) {
+//        if (StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())) {
-            qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start
+//            qcCheckReportIncome.setCheckTimeStart(DateUtils.getDate() + " 00:00:00");//start
-            LocalDate date = LocalDate.now();
+//            LocalDate date = LocalDate.now();
-            LocalDate dateEnd = date.plusDays(1);
+//            LocalDate dateEnd = date.plusDays(1);
-            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+//            DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            String dateEndStr = dtf.format(dateEnd) + " 00:00:00";
+//            String dateEndStr = dtf.format(dateEnd) + " 00:00:00";
-            qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end
+//            qcCheckReportIncome.setCheckTimeEnd(dateEndStr);//end
-        }
+//        }
 
 //		if(StringUtils.isEmpty(qcCheckReportIncome.getCheckTimeStart())){
 //			qcCheckReportIncome.setCheckTimeStart(qcCheckReportIncome.getIncomeTimeStart());//start

op-modules/op-quality/src/main/java/com/op/quality/mapper/QcCheckTaskUserMapper.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.op.quality.domain.QcCheckTaskUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 来料检验任务--检查人Mapper接口
@@ -70,5 +71,7 @@ public interface QcCheckTaskUserMapper {
 
     public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo);
 
-    public int deleteQcCheckTaskUserByBelongTos(String[] belongToArray);
+    public int deleteQcCheckTaskUserByBelongTos(@Param("array") String[] belongToArray);
+
+    public int deleteTaskDetailByBelongTos(@Param("array")String[] belongToArray);
 }

op-modules/op-quality/src/main/java/com/op/quality/service/IQcCheckTaskUserService.java

@@ -72,4 +72,5 @@ public interface IQcCheckTaskUserService {
     public QcCheckTaskUser selectQcCheckTaskUserByBelongTo(String belongTo);
 
     public int insertQcCheckTaskUserPDA(List<QcCheckTaskUser> qcCheckTaskUserList);
+
 }

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

@@ -70,6 +70,7 @@ public class QcCheckReportProductServiceImpl implements IQcCheckReportProductSer
     public List<QcCheckReportIncome> selectQcCheckReportIncomeList(QcCheckReportIncome qcCheckReportIncome) {
         qcCheckReportIncome.setDelFlag("0");
         qcCheckReportIncome.setTypeCode("product");
+        qcCheckReportIncome.setCheckType("checkTypeCP");
         return qcCheckReportIncomeMapper.selectQcCheckReportIncomeList(qcCheckReportIncome);
     }
 

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

@@ -284,7 +284,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		//发企业微信--------------------开始(跟班组无关)
 		SysNoticeGroup noticeQo = new SysNoticeGroup();
 		noticeQo.setNoticeId(6L);
-		List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNotices(noticeQo);
+		List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo);
 		if(!CollectionUtils.isEmpty(notices)) {
 
 			List<WechartDTO> wecharts = new ArrayList<>();

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

@@ -114,6 +114,7 @@ public class QcCheckTaskUserServiceImpl implements IQcCheckTaskUserService {
     @Override
     @DS("#header.poolName")
     public int deleteQcCheckTaskUserByBelongTos(String[] belongToArray) {
+        qcCheckTaskUserMapper.deleteTaskDetailByBelongTos(belongToArray);
         return qcCheckTaskUserMapper.deleteQcCheckTaskUserByBelongTos(belongToArray);
     }
 

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

@@ -163,8 +163,9 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 		qctp.setTypeId(qcCheckTaskWarehousing.getCheckType());//生产过程检验
 		qctp.setMaterialCode(qcCheckTaskWarehousing.getMaterialCode());//特性
 		/**qc_check_type_project**/
-		List<QcCheckTaskDetail> items = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);
+		List<QcCheckTaskDetail> items = new ArrayList<>();
-		if(CollectionUtils.isEmpty(items)){
+		List<QcCheckTaskDetail> items0 = qcCheckTypeProjectMapper.getTPByTypeMaterial(qctp);//个性
+		items.addAll(items0);
 		/**qc_material_group_detail**/
 		QcMaterialGroupDetail group = qcMaterialGroupDetailMapper.getGroupByMaterial(qcCheckTaskWarehousing.getMaterialCode());
 		if(group == null){
@@ -174,7 +175,6 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 		qctp.setGroupId(group.getGroupId());//共性
 		List<QcCheckTaskDetail> itemsGG = qcCheckTypeProjectMapper.getTPByTypeGroup(qctp);
 		items.addAll(itemsGG);
-		}
 
 		/**qc_check_task_detail**/
 		if(CollectionUtils.isEmpty(items)){
@@ -270,6 +270,8 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 		SysNoticeGroup noticeQo = new SysNoticeGroup();
 		if(qcCheckTaskWarehousing.getCheckType().equals("checkTypeCP")){
 			noticeQo.setNoticeId(7L);//成品检验
+		}else if(qcCheckTaskWarehousing.getCheckType().equals("checkTypeCPPC")){
+			noticeQo.setNoticeId(12L);//批次成品检验
 		}
 
 		List<SysNoticeGroup> notices = qcCheckTaskIncomeMapper.getNoticesGroup(noticeQo);
@@ -286,11 +288,11 @@ public class QcCheckTaskWarehousingServiceImpl implements IQcCheckTaskWarehousin
 				wechart0.setText(contentInfo);
 				wecharts.add(wechart0);
 			}
-			logger.info("来料检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts));
+			logger.info("成品检验企业微信提醒请求：" + JSONObject.toJSONString(wecharts));
 			if (!CollectionUtils.isEmpty(wecharts)) {
 				new Thread(() -> {
 					AjaxResult wxresult = remoteOpenService.sendWeChartMessage(wecharts);
-					logger.info("来料检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult));
+					logger.info("成品检验企业微信提醒结果：" + JSONObject.toJSONString(wxresult));
 
 				}).start();
 			}

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

@@ -440,7 +440,7 @@
             or pow.product_date = CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120))
     </select>
     <select id="getOrderWorksW3" resultType="com.op.quality.domain.QcCheckTaskProduce">
-        select
+        select top 1
             pow.factory_code factoryCode,
             pow.workorder_code workorderCode,
             pow.product_code materialCode,

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

@@ -170,11 +170,17 @@
 		group by belong_to
 	</select>
 
-    <delete id="deleteQcCheckTaskUserByBelongTos" parameterType="String">
+    <update id="deleteQcCheckTaskUserByBelongTos" parameterType="String">
-        delete from qc_check_task_user where belong_to in
+        update qc_check_task_user set del_flag = '1' where belong_to in
-        <foreach item="belongTo" collection="Array" open="(" separator="," close=")">
+        <foreach item="belongTo" collection="array" open="(" separator="," close=")">
             #{belongTo}
         </foreach>
-    </delete>
+    </update>
 
+    <update id="deleteTaskDetailByBelongTos" parameterType="String">
+        update qc_check_task_detail set del_flag = '1' where belong_to in
+        <foreach item="belongTo" collection="array" open="(" separator="," close=")">
+            #{belongTo}
+        </foreach>
+    </update>
 </mapper>

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

@@ -223,10 +223,10 @@
 		delete from qc_check_task where record_id = #{recordId}
 	</delete>
 
-    <delete id="deleteQcCheckTaskWarehousingByRecordIds" parameterType="String">
+    <update id="deleteQcCheckTaskWarehousingByRecordIds" parameterType="String">
-        delete from qc_check_task where record_id in
+        update qc_check_task set del_flag = '1' where record_id in
         <foreach item="recordId" collection="array" open="(" separator="," close=")">
             #{recordId}
         </foreach>
-    </delete>
+    </update>
 </mapper>

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

@@ -122,7 +122,7 @@
             <!--,qcp.check_standard checkStandard-->
         from qc_check_type_project qctp
         left join qc_check_project qcp on qcp.id = qctp.project_id
-        where qctp.del_flag = '0' and qctp.status = '1'
+        where qctp.del_flag = '0' and qctp.status = '1' and qcp.del_flag='0'
         and qctp.group_id = #{groupId}
         and qctp.type_id = #{typeId}
         order by qctp.sort