Merge remote-tracking branch 'origin/master'

master
Yangwl 2 weeks ago
commit 19af92449e

@ -115,6 +115,15 @@ public class WmsToWCSmissionController {
}
/**
* --
*/
@PostMapping("/PurchaseOrderPdaT")
public AjaxResult PurchaseOrderPdaT(@RequestBody OdsProcureOrder odsProcureOrder) {
List<OdsProcureOrder> orderList = odsProcureOrderService.PurchaseOrderPdaT(odsProcureOrder);
return success(orderList);
}
/**
*
*/

@ -125,4 +125,6 @@ public interface OdsProcureOrderMapper {
public void updateodsProcureOrderCardByu1(OdsProcureOrder order1);
String selectBaseProductAttached(@Param("order1MaterialCode")String order1MaterialCode);
public List<OdsProcureOrder> selectOdsProcureOrderListT(OdsProcureOrder odsProcureOrder);
}

@ -158,4 +158,6 @@ public interface IOdsProcureOrderService {
void OutboundPostingzcSAPTS(List<OdsProcureOutOrder> orderList);
void OutboundPostingzcSAPTH(List<OdsProcureOutOrder> orderList);
List<OdsProcureOrder> PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder);
}

@ -1750,6 +1750,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
}
}
@Override
public List<OdsProcureOrder> PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder) {
DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode());
odsProcureOrder.setOperationNumber(new BigDecimal("1"));
return odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder);
}
@Override
@DS("#header.poolName")

@ -127,7 +127,48 @@
</where>
order by Create_Date desc
</select>
<select id="selectOdsProcureOrderListT" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
<include refid="selectOdsProcureOrderVo"/>
<where>
<if test="siteCode != null and siteCode != ''">and Site_code = #{siteCode}</if>
<if test="ID != null and ID != ''">and ID = #{ID}</if>
<if test="procureCode != null and procureCode != ''">and Procure_Code = #{procureCode}</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>
<if test="Unit != null and Unit != ''">and Unit = #{Unit}</if>
<if test="realityNumber != null ">and Reality_Number = #{realityNumber}</if>
<if test="orderStatus != null and orderStatus != ''">and Order_Status = #{orderStatus}</if>
<if test="userDefined1 != null and userDefined1 != ''">and User_Defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''">and User_Defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''">and User_Defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''">and User_Defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''">and User_Defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''">and User_Defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''">and User_Defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''">and User_Defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''">and User_Defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''">and User_Defined10 = #{userDefined10}</if>
<if test="userDefined11 != null and userDefined11 != ''">and User_Defined11 = #{userDefined11}</if>
<if test="supplierCode != null and supplierCode != ''">and Supplier_Code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''">and Supplier_Name like concat('%', #{supplierName},
'%')
</if>
<if test="Remark != null and Remark != ''">and Remark = #{Remark}</if>
<if test="createBy != null and createBy != ''">and Create_By = #{createBy}</if>
<if test="createDate != null ">and Create_Date = #{createDate}</if>
<if test="lastUpdateBy != null and lastUpdateBy != ''">and Last_Update_By = #{lastUpdateBy}</if>
<if test="lastUpdateDate != null ">and Last_Update_Date = #{lastUpdateDate}</if>
<if test="Active != null and Active != ''">and Active = #{Active}</if>
<if test="enterpriseId != null and enterpriseId != ''">and Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''">and Enterprise_Code = #{enterpriseCode}</if>
<if test="palletNum != null and palletNum != ''">and pallet_num = #{palletNum}</if>
<if test="operationNumber != null and operationNumber != ''">and Operation_Number is not null </if>
</where>
order by Create_Date desc
</select>
<select id="selectOdsProcureOrderByID" parameterType="String" resultMap="OdsProcureOrderResult">
<include refid="selectOdsProcureOrderVo"/>
where ID = #{ID}
@ -883,6 +924,7 @@
ods_procure_order_card
LEFT JOIN ods_procure_order ON ods_procure_order.ID = TRY_CAST(ods_procure_order_card.User_Defined4 AS INT)
WHERE ods_procure_order.user_defined5=#{userDefined5}
AND ods_procure_order.Operation_Number IS NOT NULL
</select>
<select id="selectCardListSH" resultMap="OdsProcureOrderResult">
SELECT

@ -906,7 +906,7 @@
wms_ods_procure_return_order.Plan_Number,
wms_ods_procure_return_order.Unit,
COALESCE ( wms_ods_procure_return_order.Return_Number, 0 ) AS Return_Number,
wms_raw_mission_out.user_defined2 Loc_Code,
wms_raw_order_in_sn.wh_code Loc_Code,
wms_ods_procure_return_order.Loc_Desc,
wms_ods_procure_return_order.Production_Line_Desc,
wms_ods_procure_return_order.Production_Line_Code,
@ -933,8 +933,8 @@
wms_ods_procure_return_order.Enterprise_Code
FROM
wms_ods_procure_return_order
LEFT JOIN wms_raw_mission_out ON wms_raw_mission_out.prd_order = wms_ods_procure_return_order.Produce_Code
AND wms_raw_mission_out.material_code = wms_ods_procure_return_order.Material_Code
LEFT JOIN wms_raw_order_in_sn ON wms_raw_order_in_sn.user_defined5 = wms_ods_procure_return_order.Produce_Code
AND wms_raw_order_in_sn.material_code = wms_ods_procure_return_order.Material_Code
where wms_ods_procure_return_order.ID IN
<foreach item="odsProcureOutOrder" collection="list" open="(" separator="," close=")">
#{odsProcureOutOrder.ID}

@ -532,7 +532,8 @@
AND qc.check_type = 'checkTypeCP'
WHERE
mw.report_code = #{wmsProductPut.workOrder}
AND mw.product_code = #{wmsProductPut.productCode}
AND mw.product_code like concat('%', #{wmsProductPut.productCode},
'%')
AND mw.batch = #{wmsProductPut.batchNumber}
AND qc.check_result IS NOT NULL
<![CDATA[ AND qc.check_result <> '']]>

Loading…
Cancel
Save