来料增加来料类型

op-api/op-api-system/src/main/java/com/op/system/api/domain/quality/QcCheckTaskIncomeDTO.java

@@ -136,6 +136,15 @@ public class QcCheckTaskIncomeDTO extends BaseEntity {
 	private BigDecimal bNoOkquality;
 	private BigDecimal cNoOkquality;
 	private String orderType;
+	private String orderTypeDesc;
+
+	public String getOrderTypeDesc() {
+		return orderTypeDesc;
+	}
+
+	public void setOrderTypeDesc(String orderTypeDesc) {
+		this.orderTypeDesc = orderTypeDesc;
+	}
 
 	public String getOrderType() {
 		return orderType;

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

@@ -1,5 +1,6 @@
 package com.op.mes.mapper;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -144,4 +145,6 @@ public interface MesReportWorkMapper {
     int updateAttr2(MesReportWork workorder);
 
     void updateReportRemark(@Param("list") List<MesReportWork> mesReportWork);
+
+    BigDecimal getReportRate(String productCode);
 }

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

@@ -37,6 +37,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
@@ -372,6 +373,13 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             if(sHzWorks==null){
                 return R.fail("未查询到子报工单");
             }
+            //查询base_product的report_rate//箱子-大盒-小盒
+            BigDecimal reportRate = mesReportWorkMapper.getReportRate(workOrders.get(0).getProductCode());
+            if(reportRate != null){
+                BigDecimal newQuantity = sHzWorks.getQuantityFeedback().divide(reportRate,2, RoundingMode.HALF_UP);
+                sHzWorks.setQuantityFeedback(newQuantity);
+            }
+
             //子工单报工
             logger.info("==========================子工单报工开始");
             sapRson = this.reportHzToSap(sHzWorks);

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

@@ -473,7 +473,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="getSapWorkOrder" resultType="com.op.mes.domain.MesReportWork">
 		select workorder_code_sap workorderCodeSap,
 		       workorder_code workorderCode,
-			   factory_code factoryCode
+			   factory_code factoryCode,
+			   product_code productCode
 		from pro_order_workorder
 		where belong_work_order = #{workorderCode} and del_flag = '0' <!--and status = 'w2'-->
 		order by order_code
@@ -694,6 +695,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where mrwc.attr1 = '1' and mrwc.del_flag = '0' and mrwc.attr2 = '0'
 		  and mrwc.parent_order = #{workorderCode}
 	</select>
+	<select id="getReportRate" resultType="java.math.BigDecimal">
+		select report_rate from base_product
+		where product_code = #{productCode}
+		  and del_flag = '0'
+	</select>
 
 	<insert id="insertMesReportWork" parameterType="MesReportWork">
 		insert into mes_report_work

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

@@ -168,6 +168,7 @@ public class QcCheckTaskIncome extends BaseEntity {
      */
     private String delFlag;
     private String orderType;
+    private String orderTypeDesc;
     private String incomeTimeStart;
     private String incomeTimeEnd;
     private String checkTimeStart;
@@ -195,6 +196,15 @@ public class QcCheckTaskIncome extends BaseEntity {
 
     private String materialType;//来料类别
     private String materialFrom;//物料来源
+
+    public String getOrderTypeDesc() {
+        return orderTypeDesc;
+    }
+
+    public void setOrderTypeDesc(String orderTypeDesc) {
+        this.orderTypeDesc = orderTypeDesc;
+    }
+
     public String getMaterialType() {
         return materialType;
     }

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

@@ -256,7 +256,7 @@ public class QcCheckTaskIncomeServiceImpl<QcCheckUnqualifiedService> implements
 			}
 		}
 		qcCheckTaskIncome.setNoOkQuality(noOkQuality);
-		/**qc_check_task**/
+		/**qc_check_task**///------------------zxl
 		qcCheckTaskIncomeMapper.insertQcCheckTaskIncome(qcCheckTaskIncome);
 
 		/**qc_check_task_detail**/

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

@@ -36,13 +36,17 @@
         <result property="delFlag" column="del_flag"/>
         <result property="checkType" column="check_type"/>
         <result property="sampleQuality" column="sample_quality"/>
+
+        <result property="orderType" column="order_type"/>
+        <result property="orderTypeDesc" column="order_type_desc"/>
     </resultMap>
 
     <sql id="selectQcCheckTaskIncomeVo">
 		select record_id, check_no, income_batch_no, order_no, material_code, material_name, quality, unit,
 		       supplier_code, supplier_name, income_time, check_loc, check_status, check_man_code,
 		       check_man_name, check_time, check_result, status, attr1, attr2, attr3, attr4, create_by,
-		       create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality
+		       create_time, update_by, update_time, factory_code, del_flag , check_type,sample_quality, noOk_quality,
+               order_type,order_type_desc
 		from qc_check_task
 	</sql>
 
@@ -52,7 +56,7 @@
         qct.supplier_code, qct.supplier_name, qct.income_time, qct.check_loc, qct.check_status,
         qct.check_man_code, qct.check_man_name,qct.check_time, qct.check_result, qct.status,
         qct.create_by,qct.create_time, qct.update_by, qct.update_time,qct.check_type,qct.noOk_quality,
-        qct.sample_quality, qct.type_code
+        qct.sample_quality, qct.type_code, qct.order_type
         from qc_check_task qct
         <where>
             <if test="checkNo != null  and checkNo != ''">and qct.check_no = #{checkNo}</if>
@@ -83,6 +87,7 @@
             <if test="checkTimeEnd != null ">and #{checkTimeEnd} > CONVERT(varchar(30),qct.check_time, 120)</if>
             <if test="checkType != null ">and qct.check_type = #{checkType}</if>
             <if test="typeCode != null ">and qct.type_code = #{typeCode}</if>
+            <if test="orderType != null ">and qct.order_type = #{orderType}</if>
         </where>
         order by qct.create_time DESC
     </select>
@@ -208,6 +213,7 @@
             <if test="typeCode != null">type_code,</if>
             <if test="sampleQuality != null">sample_quality,</if>
             <if test="orderType != null">order_type,</if>
+            <if test="orderTypeDesc != null">order_type_desc,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="recordId != null">#{recordId},</if>
@@ -243,6 +249,7 @@
             <if test="typeCode != null">#{typeCode},</if>
             <if test="sampleQuality != null">#{sampleQuality},</if>
             <if test="orderType != null">#{orderType},</if>
+            <if test="orderTypeDesc != null">#{orderTypeDesc},</if>
         </trim>
     </insert>
 

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

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