三层报工bug修复

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

@@ -398,7 +398,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             }
 
         }else if(workOrders.size()>=3){
-            MesReportWork hzWorks = null;
+            BigDecimal gamng = null;
             for(int n=0;n<workOrders.size();n++){
                 MesReportWork workOrder = workOrders.get(n);
 
@@ -409,12 +409,15 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                 if (sHzWorks == null) {
                     return R.fail(workOrder.getWorkorderCode()+"未查询到报工单");
                 }
-                if(n==0){
+                if(n == (workOrders.size()-2)){
-                    hzWorks = sHzWorks;
+                    gamng = sHzWorks.getQuantityFeedback();
+                }
+                if(n == (workOrders.size()-1)){
+                    sHzWorks.setQuantityFeedback(gamng);
                 }
                 //三层以上工单报工
                 logger.info("==========================三层(第"+n+"层)以上工单("+sHzWorks.getWorkorderCodeSap()+")报工开始");
-                sHzWorks.setQuantityFeedback(hzWorks.getQuantityFeedback());
+
                 sapRson = this.reportHzToSap(sHzWorks);
                 logger.info("==========================三层(第"+n+"层)以上工单("+sHzWorks.getWorkorderCodeSap()+")报工结束:"
                         + JSONObject.toJSONString(sapRson));

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

@@ -273,8 +273,14 @@ public class MesReportWorkServiceImpl implements IMesReportWorkService {
 	@DS("#header.poolName")
 	public int reportSapCancel(MesReportWork mesReportWork) {
 		mesReportWork.setFactoryCode(ServletUtils.getRequest().getHeader("PoolName"));
-		int m = mesReportWorkMapper.reportSapCancel(mesReportWork);
+		mesReportWorkMapper.reportSapCancel(mesReportWork);
-		return m;
+		ProOrderWorkorder son = mesReportWorkMapper.getSonWorkOrder(mesReportWork.getWorkorderCode());
+		while(son != null){
+			mesReportWork.setWorkorderCode(son.getWorkorderCode());
+			mesReportWorkMapper.reportSapCancel(mesReportWork);
+			son = mesReportWorkMapper.getSonWorkOrder(son.getWorkorderCode());
+		}
+		return 1;
 	}
 
 	@Override

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

@@ -520,9 +520,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<where>
 		 pow.del_flag = '0'
 		<if test="keywords != null  and keywords != ''">
-		 	and pow.order_code like concat('%', #{keywords}, '%') or
+		 	and (
-			pow.workorder_code_sap like concat('%', #{keywords}, '%') or
+				pow.order_code like concat('%', #{keywords}, '%') or
-			mrw.productCode like concat('%', #{keywords}, '%')
+				pow.workorder_code_sap like concat('%', #{keywords}, '%') or
+				mrw.productCode like concat('%', #{keywords}, '%')
+			)
 		</if>
 		<if test="feedbackTimeStart != null "> and pow.product_date >= #{feedbackTimeStart}</if>
 		<if test="feedbackTimeEnd != null "> and #{feedbackTimeEnd} >= pow.product_date</if>

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

@@ -193,6 +193,24 @@ public class QcCheckTaskIncome extends BaseEntity {
     private String noOkQualityNames;
     private String noOkQualityVals;
 
+    private String materialType;//来料类别
+    private String materialFrom;//物料来源
+    public String getMaterialType() {
+        return materialType;
+    }
+
+    public void setMaterialType(String materialType) {
+        this.materialType = materialType;
+    }
+
+    public String getMaterialFrom() {
+        return materialFrom;
+    }
+
+    public void setMaterialFrom(String materialFrom) {
+        this.materialFrom = materialFrom;
+    }
+
     public String getCheckLocName() {
         return checkLocName;
     }

op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java

@@ -412,7 +412,10 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 qcCheckTaskIncomeDTO.setRecordId(IdUtils.fastSimpleUUID());
                 qcCheckTaskIncomeDTO.setCheckType("checkTypeLL");
                 qcCheckTaskIncomeDTO.setTypeCode("material");
-                qcCheckTaskIncomeDTO.setOrderType("bc");//包材
+                /**8010 榄菊成品；8020 榄菊半成品；8030 榄菊原材料；8040 榄菊包装材料；8050 榄菊塑料五金电子；8060 榄菊辅助用品
+                ；8061 榄菊办公用品；8062 榄菊劳保用品；8070 榄菊广宣品；8090 榄菊未估价的物料**/
+                qcCheckTaskIncomeDTO.setOrderType(maraTable.getString("MTART"));//物料类型
+                qcCheckTaskIncomeDTO.setAttr4(maraTable.getString("MTBEZ"));//物料类型描述
                 qcCheckTaskIncomeDTO.setOrderNo(maraTable.getString("EBELN"));//采购订单
                 qcCheckTaskIncomeDTO.setSupplierCode(maraTable.getString("LIFNR"));
                 qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM"));