报告修改

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -1304,7 +1304,9 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                     }
                 }
             }
+            if(!CollectionUtils.isEmpty(dtos)){
                 proOrderWorkorderMapper.addBatchPallet(dtos);
+            }
         }else{
             dtos.addAll(dtos0);
         }

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

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

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

@@ -215,6 +215,15 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String pgzr;//质量主管
     private String oaFactoryF;//异常范围
     private String sccj;
+    private String bz;
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
 
     public String getSccj() {
         return sccj;

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

@@ -206,6 +206,15 @@ public class QcCheckTaskProduce extends BaseEntity {
     private String confirmRemark;
     private String confirmTime;
     private String shiftId;
+    private String bz;//备注
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
 
     public String getShiftId() {
         return shiftId;

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

@@ -85,4 +85,6 @@ public interface QcCheckReportIncomeMapper {
     List<QcCheckTaskProduce> getLastProductTypeInfo(QcCheckTaskProduce qcCheckTaskProduce);
 
     List<String> getBatchsByTaskId(String recordId);
+
+    QcCheckTaskProduce getLastXJ(QcCheckTaskProduce qcCheckTaskProduce);
 }

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

@@ -197,6 +197,10 @@ public class QcCheckReportIncomeServiceImpl implements IQcCheckReportIncomeServi
     public List<QcCheckTaskDetail> getCkeckProjectList(QcCheckTaskDetail qcCheckTaskDetail) {
         List<QcCheckTaskDetail> dtos = qcCheckReportIncomeMapper.getCkeckProjectList(qcCheckTaskDetail);
         for (QcCheckTaskDetail dto : dtos) {
+            if(StringUtils.isNotBlank(dto.getSamplePlan())){
+                dto.setSamplePlan(dto.getSamplePlan().replace(".00",""));
+            }
+
             List<BaseFile> files = qmsFileMapper.getBaseFileBatch(dto.getRecordId());
             if (!CollectionUtils.isEmpty(files)) {
                 dto.setFiles(files);

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

@@ -221,6 +221,11 @@ public class QcCheckReportProduceServiceImpl implements IQcCheckReportProduceSer
         qcStaticTable.setShiftId(qcCheckTaskProduce.getShiftId());
         List<QcStaticTable> checkInfos = qcStaticTableService.getXJCheckTableDetail(qcStaticTable);
         produce.setCheckInfos(checkInfos);
+        QcCheckTaskProduce lastXJ = qcCheckReportIncomeMapper.getLastXJ(qcCheckTaskProduce);
+        if(lastXJ!=null){
+            produce.setBz(lastXJ.getBz());
+        }
+
         List<QcCheckTaskProduce> lastProduces = qcCheckReportIncomeMapper.getLastProductTypeInfo(qcCheckTaskProduce);
         if (!CollectionUtils.isEmpty(lastProduces)) {
             produce.setProductType(lastProduces.get(0).getProductType());

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

@@ -689,7 +689,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 		qcCheckTask.setCheckManName(qcCheckTaskIncome.getUpdateByName());
 		qcCheckTask.setSampleQuality(qcCheckTaskIncome.getSampleQuality());
 		qcCheckTask.setReason(qcCheckTaskIncome.getReason());
-		qcCheckTask.setAttr3(qcCheckTaskIncome.getAttr3());
+		qcCheckTask.setBz(qcCheckTaskIncome.getAttr3());//备注
 		/**qc_check_task**/
 		n = qcCheckTaskIncomeMapper.updateQcCheckTask(qcCheckTask);
 		logger.info("qc_check_task:"+n);

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

@@ -263,6 +263,15 @@
         where qct.record_id = #{recordId}
         order by powb.batch_code
     </select>
+    <select id="getLastXJ" resultType="com.op.quality.domain.QcCheckTaskProduce">
+        SELECT
+            top 1 c.bz
+        FROM
+            qc_check_task c
+        where c.check_type='checkTypeSCXJ' and c.order_no = #{orderNo}
+          and c.bz is not null
+        order by c.create_time desc
+    </select>
     <insert id="insertQcCheckReportIncome" parameterType="QcCheckReportIncome">
         insert into qc_check_task
         <trim prefix="(" suffix=")" suffixOverrides=",">

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

@@ -314,7 +314,7 @@
         <if test="incomeBatchNo != null">income_batch_no = #{incomeBatchNo},</if>
         <if test="remark != null">remark = #{remark},</if>
         <if test="reason != null">reason = #{reason},</if>
-        <if test="attr3 != null">attr3 = #{attr3},</if>
+        <if test="bz != null">bz = #{bz},</if>
         check_result = #{checkResult},
         update_by = #{updateBy},
         update_time = #{updateTime}