Merge remote-tracking branch 'origin/master'

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

@@ -303,7 +303,7 @@ public class ProOrderServiceImpl implements IProOrderService {
                     workOrder.setProductName(productNameInfo.getProdDesc());
 
                     workOrder.setBelongWorkOrder(belongWorkOrder);
-                    workOrder.setProdType("LJ01");
+                    workOrder.setProdType(proOrder.getOrderType());
 
                     // 将工单信息更新至数据库/**pro_order_workorder**/
                     proOrderWorkorderMapper.insertProOrderWorkorder(workOrder);
@@ -574,7 +574,6 @@ public class ProOrderServiceImpl implements IProOrderService {
             order.setPlanFactoryCode(factoryCode);
             order.setFactoryCode(factoryCode);
             order.setCreateBy(SecurityUtils.getUsername());
-            order.setOrderType("LJ01");
             order.setProdType("prod");
             order.setStatus("o0");
             bpqo = new BaseProduct();

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

@@ -412,6 +412,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
                 qcCheckTaskIncomeDTO.setRecordId(IdUtils.fastSimpleUUID());
                 qcCheckTaskIncomeDTO.setCheckType("checkTypeLL");
                 qcCheckTaskIncomeDTO.setTypeCode("material");
+                qcCheckTaskIncomeDTO.setOrderType("bc");//包材
                 qcCheckTaskIncomeDTO.setOrderNo(maraTable.getString("EBELN"));//采购订单
                 qcCheckTaskIncomeDTO.setSupplierCode(maraTable.getString("LIFNR"));
                 qcCheckTaskIncomeDTO.setSupplierName(maraTable.getString("LIFNR_NM"));

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java

@@ -344,6 +344,12 @@ public class BaseProduct extends BaseEntity {
     @Excel(name = "其它")
     private String other;
 
+    /**
+     * 报工汇率
+     */
+    @Excel(name = "报工汇率")
+    private Integer reportRate;
+
     public void setCategory(String category) {
         this.category = category;
     }
@@ -784,6 +790,14 @@ public class BaseProduct extends BaseEntity {
         return mtart;
     }
 
+    public void setReportRate(Integer reportRate) {
+        this.reportRate = reportRate;
+    }
+
+    public Integer getReportRate() {
+        return reportRate;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml

@@ -64,10 +64,11 @@
         <result property="pvc" column="pvc"/>
         <result property="supportPlate" column="support_plate"/>
         <result property="other" column="other"/>
+        <result property="reportRate" column="report_rate"/>
     </resultMap>
 
     <sql id="selectBaseProductVo">
-		select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent,mtart from base_product
+		select product_id, product_code, product_desc_zh, product_model,product_desc_en, rule_code, old_product_code, parts_product_code, sku_barcode, length, width, height, gross_weight, net_weight, tare_weight, volume, unit_price, product_group, product_group_name, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, create_by, create_time, update_by, update_time, factory_code, active_flag, sync_flag, primary_uom, del_flag, bstme, basic_order, conv_order, ausme, basic_issue, conv_issue, append_flag, append_percent, mtart, report_rate from base_product
 	</sql>
 
     <select id="selectBaseProductList" parameterType="BaseProduct" resultMap="BaseProductResult">
@@ -110,6 +111,7 @@
             <if test="appendFlag != null  and appendFlag != ''">and append_flag = #{appendFlag}</if>
             <if test="appendPercent != null  and appendPercent != ''">and append_percent = #{appendPercent}</if>
             <if test="mtart != null  and mtart != ''">and mtart = #{mtart}</if>
+            <if test="reportRate != null  and reportRate != ''">and report_rate = #{reportRate}</if>
             and del_flag = '0'
         </where>
         order by product_code asc
@@ -160,6 +162,7 @@
 		bp.append_flag,
 		bp.append_percent,
 		bp.mtart,
+		bp.report_rate,
 		bpa.category,
 		bpa.pc,
 		bpa.iei,
@@ -229,6 +232,7 @@
             <if test="appendFlag != null">append_flag,</if>
             <if test="appendPercent != null">append_percent,</if>
             <if test="mtart != null">mtart,</if>
+            <if test="reportRate != null">report_rate,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="productId != null">#{productId},</if>
@@ -274,6 +278,7 @@
             <if test="appendFlag != null">#{appendFlag},</if>
             <if test="appendPercent != null">#{appendPercent},</if>
             <if test="mtart != null">#{mtart},</if>
+            <if test="reportRate != null">#{reportRate},</if>
         </trim>
     </insert>
 
@@ -321,6 +326,7 @@
             <if test="appendFlag != null">append_flag = #{appendFlag},</if>
             <if test="appendPercent != null">append_percent = #{appendPercent},</if>
             <if test="mtart != null and mtart != ''">mtart = #{mtart},</if>
+            <if test="reportRate != null and reportRate != ''">report_rate = #{reportRate},</if>
         </trim>
         where product_id = #{productId}
     </update>
@@ -398,6 +404,7 @@
 		bp.append_flag,
 		bp.append_percent,
 		bp.mtart,
+		bp.report_rate,
 		bpa.category,
 		bpa.pc,
 		bpa.iei,