手持机105过账功能

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java

@@ -137,4 +137,15 @@ public class WmsRawOrderInController extends BaseController {
         List<WmsRawOrderIn> list = wmsRawOrderInService.listInspectionReport(wmsRawOrderIn);
         return getDataTable(list);
     }
+
+    /**
+     * pda上查询包材到货单已暂时列表
+     */
+    @GetMapping("/wmsRawOrderInListToPda")
+    public TableDataInfo getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn) {
+        startPage();
+        List<WmsRawOrderIn> list = wmsRawOrderInService.getWmsRawOrderInListToPda(wmsRawOrderIn);
+        return getDataTable(list);
+    }
+
 }

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

@@ -315,6 +315,18 @@ public class OdsProcureOrder extends BaseEntity {
     @Excel(name = "供应商编码")
     private String supplierCode;
 
+    /**
+     * 关联表 wms_raw_order_in id;
+     * **/
+    private String rawOrderInId;
+
+    /**
+     * 质量检验状态 Y：合格
+     * **/
+    private String qualityStatus;
+
+    private String rawPoNo;
+
     private String Remark;
 
     public String getRemark() {
@@ -666,6 +678,29 @@ public class OdsProcureOrder extends BaseEntity {
         return enterpriseCode;
     }
 
+    public String getRawOrderInId() {
+        return rawOrderInId;
+    }
+
+    public void setRawOrderInId(String rawOrderInId) {
+        this.rawOrderInId = rawOrderInId;
+    }
+
+    public String getQualityStatus() {
+        return qualityStatus;
+    }
+
+    public void setQualityStatus(String qualityStatus) {
+        this.qualityStatus = qualityStatus;
+    }
+
+    public String getRawPoNo() {
+        return rawPoNo;
+    }
+
+    public void setRawPoNo(String rawPoNo) {
+        this.rawPoNo = rawPoNo;
+    }
     @Override
     public String toString() {
         return "OdsProcureOrder{" +

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

@@ -74,4 +74,7 @@ public interface WmsRawOrderInMapper {
     WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdThress(@Param("rawOrderInId")String id);
 
     List<WmsRawOrderIn> listInspectionReport(WmsRawOrderIn wmsRawOrderIn);
+
+    List<WmsRawOrderIn> getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn);
+
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java

@@ -60,4 +60,9 @@ public interface IWmsRawOrderInService {
     public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId);
 
     List<WmsRawOrderIn> listInspectionReport(WmsRawOrderIn wmsRawOrderIn);
+
+    /**
+     * pda上查询包材到货单已暂时列表
+     */
+    List<WmsRawOrderIn> getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn);
 }

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

@@ -172,12 +172,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
 //	@DS("#header.poolName")
     public List<OdsProcureOrder> PurchaseOrderPda(OdsProcureOrder odsProcureOrder) {
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
-        List<OdsProcureOrder> orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
+        List<OdsProcureOrder> list= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
-        for (OdsProcureOrder order: orderList) {
+        for (OdsProcureOrder order: list) {
-            String name = odsProcureOrderMapper.selectBaseSupplier(order);
+            WmsRawOrderIn wmsRawOrderIn = new WmsRawOrderIn();
-            order.setSupplierName(name);
+            wmsRawOrderIn.setUserDefined6( order.getRawPoNo()+order.getUserDefined7());
+            wmsRawOrderIn.setMaterialCode(order.getMaterialCode());
+            String checkResult  = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn);
+            order.setQualityStatus(checkResult);
         }
-        return orderList;
+        return list;
     }
 
     @Override
@@ -1796,7 +1799,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
     public List<OdsProcureOrder> PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder) {
         DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
         odsProcureOrder.setOperationNumber(new BigDecimal("1"));
-        return odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder);
+        List<OdsProcureOrder> list = odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder);
+        for (OdsProcureOrder order: list) {
+            WmsRawOrderIn wmsRawOrderIn = new WmsRawOrderIn();
+            wmsRawOrderIn.setUserDefined6( order.getRawPoNo()+order.getUserDefined7());
+            wmsRawOrderIn.setMaterialCode(order.getMaterialCode());
+            String checkResult  = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn);
+            order.setQualityStatus(checkResult);
+        }
+        return list;
     }
 
     @Override

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

@@ -105,4 +105,21 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService {
         List<WmsRawOrderIn> wmsRawOrderInList=  wmsRawOrderInMapper.listInspectionReport(wmsRawOrderIn);
         return wmsRawOrderInList;
     }
+
+    /**
+     * pda上查询包材到货单已暂时列表
+     *
+     * @param wmsRawOrderIn
+     */
+    @Override
+    @DS("#header.poolName")
+    public List<WmsRawOrderIn> getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn) {
+        List<WmsRawOrderIn> wmsRawOrderInList=  wmsRawOrderInMapper.getWmsRawOrderInListToPda(wmsRawOrderIn);
+        for (WmsRawOrderIn  wmsRawOrderIn1: wmsRawOrderInList) {
+            wmsRawOrderIn1.setUserDefined6( wmsRawOrderIn1.getPoNo()+wmsRawOrderIn1.getUserDefined7());
+            String checkResult  = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn1);
+            wmsRawOrderIn1.setQualityStatus(checkResult);
+        }
+        return wmsRawOrderInList;
+    }
 }

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

@@ -46,7 +46,8 @@
         <result property="factoryCode" column="factoryCode"/>
         <result property="SapTempInfor" column="Sap_Temp_Infor"/>
         <result property="temNumber" column="tem_number"/>
-
+        <result property="rawOrderInId" column="raw_order_in_id"/>
+        <result property="rawPoNo" column="po_no"/>
     </resultMap>
 
     <sql id="selectOdsProcureOrderVo">
@@ -90,7 +91,47 @@
     </sql>
 
     <select id="selectOdsProcureOrderList" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
-        <include refid="selectOdsProcureOrderVo"/>
+        SELECT
+        opo.Site_code,
+        opo.ID,
+        opo.Procure_Code,
+        opo.Material_Code,
+        opo.Material_Desc,
+        opo.Plan_Date,
+        opo.Plan_Number,
+        opo.Unit,
+        COALESCE ( opo.Reality_Number, 0 ) Reality_Number,
+        opo.Order_Status,
+        opo.User_Defined1,
+        opo.User_Defined2,
+        opo.User_Defined3,
+        opo.User_Defined4,
+        opo.User_Defined5,
+        opo.User_Defined6,
+        opo.User_Defined7,
+        opo.User_Defined8,
+        opo.User_Defined9,
+        opo.User_Defined10,
+        opo.User_Defined11,
+        opo.Supplier_Code,
+        bs.zh_desc Supplier_Name,
+        opo.Remark,
+        opo.Create_By,
+        opo.Create_Date,
+        opo.Last_Update_By,
+        opo.Last_Update_Date,
+        opo.Active,
+        opo.Enterprise_Id,
+        opo.Enterprise_Code,
+        COALESCE ( opo.Operation_Number, 0 ) Operation_Number,
+        bpa.wa_code waCode,
+        woi.raw_order_in_id,
+        woi.po_no
+        FROM
+        ods_procure_order opo
+        LEFT JOIN base_product_attached bpa on RIGHT ( opo.Material_Code, 11 ) = bpa.product_code
+        LEFT JOIN wms_raw_order_in woi ON woi.po_no= opo.Procure_Code AND woi.po_line= opo.User_Defined3
+        LEFT JOIN base_supplier bs ON bs.supplier_code = opo.Supplier_Code
         <where>
             <if test="siteCode != null  and siteCode != ''">and opo.Site_code = #{siteCode}</if>
             <if test="ID != null  and ID != ''">and opo.ID = #{ID}</if>
@@ -131,7 +172,46 @@
         order by Create_Date desc
     </select>
     <select id="selectOdsProcureOrderListT" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
-        <include refid="selectOdsProcureOrderVo"/>
+        SELECT
+        opo.Site_code,
+        opo.ID,
+        opo.Procure_Code,
+        opo.Material_Code,
+        opo.Material_Desc,
+        opo.Plan_Date,
+        opo.Plan_Number,
+        opo.Unit,
+        COALESCE ( opo.Reality_Number, 0 ) Reality_Number,
+        opo.Order_Status,
+        opo.User_Defined1,
+        opo.User_Defined2,
+        opo.User_Defined3,
+        opo.User_Defined4,
+        opo.User_Defined5,
+        opo.User_Defined6,
+        opo.User_Defined7,
+        opo.User_Defined8,
+        opo.User_Defined9,
+        opo.User_Defined10,
+        opo.User_Defined11,
+        opo.Supplier_Code,
+        opo.Supplier_Name,
+        opo.Remark,
+        opo.Create_By,
+        opo.Create_Date,
+        opo.Last_Update_By,
+        opo.Last_Update_Date,
+        opo.Active,
+        opo.Enterprise_Id,
+        opo.Enterprise_Code,
+        COALESCE ( opo.Operation_Number, 0 ) Operation_Number,
+        bpa.wa_code waCode,
+        woi.raw_order_in_id,
+        woi.po_no
+        FROM
+        ods_procure_order opo
+        LEFT JOIN base_product_attached bpa on RIGHT ( opo.Material_Code, 11 ) = bpa.product_code
+        LEFT JOIN wms_raw_order_in woi ON woi.order_no	= opo.User_Defined5 AND woi.po_no= opo.Procure_Code AND woi.po_line= opo.User_Defined3
         <where>
             <if test="siteCode != null  and siteCode != ''">and opo.Site_code = #{siteCode}</if>
             <if test="ID != null  and ID != ''">and opo.ID = #{ID}</if>

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

@@ -588,4 +588,77 @@
         ORDER BY
             ods_procure_order.Create_Date DESC
     </select>
+
+
+    <select id="getWmsRawOrderInListToPda" parameterType="WmsRawOrderIn" resultMap="WmsRawOrderInResult">
+        SELECT
+        wms_raw_order_in.raw_order_in_id,
+        wms_raw_order_in.factory_code,
+        wms_raw_order_in.wh_code,
+        wms_raw_order_in.wa_code,
+        wms_raw_order_in.wl_code,
+        wms_raw_order_in.order_in_type,
+        wms_raw_order_in.order_no,
+        wms_raw_order_in.dn_no,
+        wms_raw_order_in.po_no,
+        wms_raw_order_in.po_line,
+        wms_raw_order_in.po_type,
+        wms_raw_order_in.material_code,
+        wms_raw_order_in.material_desc,
+        wms_raw_order_in.unit,
+        wms_raw_order_in.buyer_group,
+        wms_raw_order_in.supply_code,
+        wms_raw_order_in.sap_factory_code,
+        wms_raw_order_in.send_spot,
+        wms_raw_order_in.request_amount,
+        wms_raw_order_in.receipt_amount,
+        wms_raw_order_in.shelves_amount,
+        wms_raw_order_in.location,
+        wms_raw_order_in.request_time,
+        wms_raw_order_in.quality_status,
+        wms_raw_order_in.order_status,
+        wms_raw_order_in.receipt_operator,
+        wms_raw_order_in.receipt_time,
+        wms_raw_order_in.shelves_operator,
+        wms_raw_order_in.return_amount,
+        wms_raw_order_in.return_name,
+        wms_raw_order_in.return_time,
+        wms_raw_order_in.return_status,
+        wms_raw_order_in.shelves_time,
+        wms_raw_order_in.return_message,
+        wms_raw_order_in.accounting_status,
+        wms_raw_order_in.accounting_time,
+        wms_raw_order_in.accounting_message,
+        wms_raw_order_in.user_defined1,
+        wms_raw_order_in.user_defined2,
+        wms_raw_order_in.user_defined3,
+        wms_raw_order_in.user_defined4,
+        wms_raw_order_in.user_defined5,
+        wms_raw_order_in.user_defined6,
+        wms_raw_order_in.user_defined8,
+        wms_raw_order_in.user_defined9,
+        wms_raw_order_in.user_defined10,
+        wms_raw_order_in.create_by,
+        wms_raw_order_in.gmt_create,
+        wms_raw_order_in.last_modified_by,
+        wms_raw_order_in.gmt_modified,
+        ods_procure_order.User_Defined7 user_defined7,
+        wms_raw_order_in.active_flag
+        FROM
+        wms_raw_order_in
+        LEFT JOIN ods_procure_order ON wms_raw_order_in.order_no = ods_procure_order.User_Defined5
+        AND wms_raw_order_in.po_no= ods_procure_order.Procure_Code
+        AND wms_raw_order_in.po_line= ods_procure_order.User_Defined3
+        <where>
+            wms_raw_order_in.user_defined4 IS NULL
+            <if test="materialCode != null  and materialCode != ''">and wms_raw_order_in.material_code like concat('%', #{materialCode},
+                '%')  </if>
+            <if test="materialDesc != null  and materialDesc != ''">and wms_raw_order_in.material_desc like concat('%', #{materialDesc},
+                '%') </if>
+            <if test="userDefined1 != null  and userDefined1 != ''">and wms_raw_order_in.user_defined1 = #{userDefined1}</if>
+            <if test="orderNo != null  and orderNo != ''">and wms_raw_order_in.order_no = #{orderNo}</if>
+            <if test="poNo != null  and poNo != ''">and wms_raw_order_in.po_no = #{poNo}</if>
+        </where>
+        ORDER BY wms_raw_order_in.gmt_create	DESC
+    </select>
 </mapper>