wms修改

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

@@ -172,6 +172,16 @@ public class OdsProcureOutOrder extends BaseEntity {
      */
     @Excel(name = "已出库数量")
     private BigDecimal outNumber;
+    @Excel(name = "报工数量")
+    private BigDecimal BGNumber;
+
+    public BigDecimal getBGNumber() {
+        return BGNumber;
+    }
+
+    public void setBGNumber(BigDecimal BGNumber) {
+        this.BGNumber = BGNumber;
+    }
 
     /**
      * 库位编号

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java

@@ -127,4 +127,6 @@ public interface OdsProcureOutOrderMapper {
     public   List<OdsProcureOutOrder> selectPreDetailHzList(OdsProcureOutOrder odsProcureOutOrder);
 
     public  List<OdsProcureOutOrder> selectWmsOdsProcureOutOrderByOrderStatus(OdsProcureOutOrder order);
+
+    String selectMesReportWorkConsume(OdsProcureOutOrder order);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java

@@ -1176,10 +1176,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
         }else{
             dtos.addAll(dtos0);
         }
-//        for (OdsProcureOrder    order1:
-//        dtos ) {
-//
-//        }
+        for (OdsProcureOrder    order1:
+        dtos ) {
+         String materialCode=   order1.getMaterialCode();//000000040000004873
+         materialCode = materialCode.replaceFirst("^0{7}", ""); // 只替换开头的7个0
+         order1.setMaterialCode(materialCode);
+        }
        String msg=   dayin(dtos);
         return msg;
     }
@@ -1700,6 +1702,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
                 sapBackflushMPQuery.setPlant(odsProcureOutOrder.getSiteCode());     //工厂
                 String lgort = baseWarehouseMapper.selectByCode(odsProcureOutOrder.getLocCode());
                 sapBackflushMPQuery.setLgort(lgort);//库存地点
+                sapBackflushMPQuery.setUmlgo("0013");
                 sapBackflushMPQuery.setMatnr(odsProcureOutOrder.getMaterialCode());//物料号
                 sapBackflushMPQuery.setQuantity(odsProcureOutOrder.getOutNumber().toString());  //数量
                 sapBackflushMPQuery.setMeins(odsProcureOutOrder.getUnit()); //基本计量单位

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.op.wms.service.impl;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -136,6 +137,16 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
     @DS("#header.poolName")
     public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZC(OdsProcureOutOrder odsProcureOutOrder) {
         List<OdsProcureOutOrder> orderList = odsProcureOutOrderMapper.selectOdsProcureOutOrderListZC(odsProcureOutOrder);
+        for (OdsProcureOutOrder order:
+        orderList) {
+            if (order.getUserDefined4().length()>10){
+             String tem=   odsProcureOutOrderMapper.selectMesReportWorkConsume(order);
+             order.setBGNumber(new BigDecimal(tem));
+            }else {
+
+            }
+        }
+
         return orderList;
     }
 }

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

@@ -647,7 +647,8 @@
 	<where>
 		<if test="siteCode != null  and siteCode != ''"> and Site_code = #{siteCode}</if>
 		<if test="produceCode != null  and produceCode != ''"> and Produce_Code = #{produceCode}</if>
-		<if test="materialCode != null  and materialCode != ''"> and Material_Code = #{materialCode}</if>
+		<if test="materialCode != null  and materialCode != ''"> and Material_Code like concat('%', #{materialCode},
+			'%')</if>
 		<if test="materialDesc != null  and materialDesc != ''"> and Material_Desc = #{materialDesc}</if>
 		<if test="planDate != null "> and Plan_Date = #{planDate}</if>
 		<if test="planNumber != null "> and Plan_Number = #{planNumber}</if>
@@ -806,7 +807,7 @@
 		wms_ods_procure_out_order
 		LEFT JOIN	wms_raw_mission_out	ON wms_raw_mission_out.prd_order	= wms_ods_procure_out_order.Produce_Code
 		AND wms_raw_mission_out.material_code	= wms_ods_procure_out_order.Material_Code
-		where 	wms_ods_procure_out_order.ID
+		where 	wms_ods_procure_out_order.ID	IN
 		<foreach item="odsProcureOutOrder" collection="list" open="(" separator="," close=")">
 			#{odsProcureOutOrder.ID}
 		</foreach>
@@ -1057,7 +1058,7 @@
 			wms_raw_mission_out
 		WHERE
 			prd_order=#{produceCode}	AND
-			material_code=#{Material_Code}
+			material_code=#{materialCode}
 	</select>
 	<select id="selectPreDetailHzList"		resultMap="OdsProcureOutOrderResult">
 		SELECT
@@ -1127,4 +1128,13 @@
 		where Order_Status='3'	and 	Active='1'
 		and User_Defined10='1'
 	</select>
+	<select id="selectMesReportWorkConsume"	resultType="java.lang.String">
+		SELECT
+			quantity
+		FROM
+			mes_report_work_consume
+		WHERE
+			workorder_code =#{userDefined4}
+		  AND material_code = #{materialCode}
+	</select>
 </mapper>

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

@@ -50,7 +50,8 @@
             <if test="orderNo != null  and orderNo != ''">and order_no = #{orderNo}</if>
             <if test="poNo != null  and poNo != ''">and po_no = #{poNo}</if>
             <if test="poLine != null  and poLine != ''">and po_line = #{poLine}</if>
-            <if test="materialCode != null  and materialCode != ''">and material_code = #{materialCode}</if>
+            <if test="materialCode != null  and materialCode != ''">and material_code like concat('%', #{materialCode},
+                '%') </if>
             <if test="materialDesc != null  and materialDesc != ''">and material_desc = #{materialDesc}</if>
             <if test="sn != null  and sn != ''">and sn = #{sn}</if>
             <if test="barCode != null  and barCode != ''">and bar_code = #{barCode}</if>

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

@@ -35,7 +35,8 @@
         <include refid="selectWmsProductPutRecordsVo"/>
         <where>
             <if test="workOrder != null  and workOrder != ''">and work_order = #{workOrder}</if>
-            <if test="productOrder != null  and productOrder != ''">and product_order = #{productOrder}</if>
+            <if test="productOrder != null  and productOrder != ''">and product_order like concat('%', #{productOrder} ,
+                '%')</if>
             <if test="productName != null  and productName != ''">and product_name like concat('%', #{productName},
                 '%')
             </if>