升级

op-modules/op-mes/src/main/java/com/op/mes/domain/MesReportWorkConsume.java

@@ -93,6 +93,7 @@ public class MesReportWorkConsume extends BaseEntity {
     @Excel(name = "报工编码")
     private String reportCode;
 
+    private BigDecimal quantityFeedback;
     //虚拟字段
     private String id;
     private String parentOrder;
@@ -117,6 +118,14 @@ public class MesReportWorkConsume extends BaseEntity {
     private String erfmg;
     private String erfme;
 
+    public BigDecimal getQuantityFeedback() {
+        return quantityFeedback;
+    }
+
+    public void setQuantityFeedback(BigDecimal quantityFeedback) {
+        this.quantityFeedback = quantityFeedback;
+    }
+
     public String getErfmg() {
         return erfmg;
     }

op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkConsumeMapper.java

@@ -1,5 +1,6 @@
 package com.op.mes.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 import com.op.mes.domain.MesReportWorkConsume;
@@ -85,4 +86,6 @@ public interface MesReportWorkConsumeMapper {
     List<MesReportWorkConsume> getSumConsumeList(MesReportWorkConsume consumeqo);
 
     int getSumConsumeListNum(MesReportWorkConsume consumeqo);
+
+    BigDecimal getActAllProduct(MesReportWorkConsume mesReportWorkConsume);
 }

op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesReportWorkConsumeServiceImpl.java

@@ -358,6 +358,12 @@ public class MesReportWorkConsumeServiceImpl implements IMesReportWorkConsumeSer
         pTabs.setTitle("第"+i+"层工单物料损耗");
         mesReportWorkConsume.setParentOrder("0");
         List<MesReportWorkConsume> liblist0 = mesReportWorkConsumeMapper.getConsumeList(mesReportWorkConsume);
+
+        if(!CollectionUtils.isEmpty(liblist0)){
+            BigDecimal actPro = mesReportWorkConsumeMapper.getActAllProduct(mesReportWorkConsume);
+            liblist0.get(0).setQuantityFeedback(actPro);
+        }
+
         pTabs.setLibList(liblist0);
         tabs.add(pTabs);
 

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml

@@ -202,6 +202,9 @@
             and mrw.machine_code = #{machineCode}
         )t
     </select>
+    <select id="getActAllProduct" resultType="java.math.BigDecimal">
+        select sum(quantity_feedback) from mes_report_work where workorder_code = #{workorderCode} and del_flag = '0'
+    </select>
 
     <insert id="insertMesReportWorkConsume" parameterType="MesReportWorkConsume">
         insert into mes_report_work_consume

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -702,6 +702,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="productDateEnd != null and productDateEnd != ''">
 				and CONVERT(varchar(10), #{productDateEnd}, 23) >= CONVERT(varchar(10),pow.product_date, 23)
 			</if>
+		   <if test="productCode != null and productCode != ''">and pow.product_code like concat('%', #{productCode}, '%')</if>
 		order by be.equipment_code
 	</select>
 

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

@@ -927,7 +927,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 	private void setOaFunc(QcCheckUnqualified unqualified,QcCheckTaskIncome qcCheckTaskIncome){
 		//不合格描述
 		unqualified.setRemark(qcCheckTaskIncome.getRemark());
-		if("produce".equals(qcCheckTaskIncome.getTypeCode())){
+		if("produce".equals(qcCheckTaskIncome.getTypeCode())||"product".equals(qcCheckTaskIncome.getTypeCode())){
 			unqualified.setTypeCode(qcCheckTaskIncome.getTypeCode());
 			unqualified.setSfgyswt(qcCheckTaskIncome.getSfgyswt());
 			unqualified.setUser(qcCheckTaskIncome.getPgzg());//qcCheckTaskIncome.getUpdateBy();

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

@@ -100,13 +100,14 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
 		if("material".equals(taskIfo.getTypeCode())) {
 			//ZL0010-来料检验不合格控制流程
 			oaR = this.createLLOA(taskIfo);
-		}else if("produce".equals(taskIfo.getTypeCode())){
+		}else if("produce".equals(taskIfo.getTypeCode())||"product".equals(taskIfo.getTypeCode())){
             //ZL0030-品质异常流程
 			oaR = this.createProduceOA(taskIfo);
-		}else if("product".equals(taskIfo.getTypeCode())) {
-			//ZL0020-成品检验控制流程
-			oaR = this.createProductOA(taskIfo);
 		}
+//		else if("product".equals(taskIfo.getTypeCode())) {
+//			//ZL0020-成品检验控制流程
+//			oaR = this.createProductOA(taskIfo);
+//		}
 		if(oaR!=null ){
 			if((oaR.get("code").toString()).equals("200")){
 				/**qc_check_unqualified**/