Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

包材采购单页面修改

Browse Source
master
陈恒杰 6 months ago
parent 8013613b20
commit 9340ef8a3d
3 changed files with 120 additions and 33 deletions
Show Stats Download Patch File Download Diff File

8
op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java
Unescape Escape View File

@ -81,4 +81,12 @@ public interface OdsProcureOrderMapper {
void updateodsProcureOrderCard(OdsProcureOrder order1);
OdsProcureOrder selectOdsProcureOrderByIDAndSap(String id);
/**
* 查询包材采购单列表
*
* @param odsProcureOrder 包材采购单
* @return 包材采购单集合
*/
public List<OdsProcureOrder> selectOdsProcureOrderList1(OdsProcureOrder odsProcureOrder);
}

6
op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java
Unescape Escape View File

@ -108,7 +108,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
@Override
@DS("#header.poolName")
public List<OdsProcureOrder> selectOdsProcureOrderList(OdsProcureOrder odsProcureOrder) {
List<OdsProcureOrder> orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder);
List<OdsProcureOrder> orderList= odsProcureOrderMapper.selectOdsProcureOrderList1(odsProcureOrder);
for (OdsProcureOrder order:
orderList) {
String name = odsProcureOrderMapper.selectBaseSupplier(order);
@ -1454,6 +1454,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
}
}
public String dayin( List<OdsProcureOrder> orderList) {
// 定义请求的URL地址
String url = dayinUrl1;
@ -1820,4 +1822,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
return null;
}
}

139
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml
Unescape Escape View File

@ -44,41 +44,40 @@
<sql id="selectOdsProcureOrderVo">
SELECT
o.Site_code,
o.ID,
o.Procure_Code,
o.Material_Code,
o.Material_Desc,
o.Plan_Date,
o.Plan_Number,
o.Unit,
Site_code,
ID,
Procure_Code,
Material_Code,
Material_Desc,
Plan_Date,
Plan_Number,
Unit,
COALESCE ( Reality_Number, 0 ) Reality_Number,
o.Order_Status,
o.User_Defined1,
o.User_Defined2,
o.User_Defined3,
o.User_Defined4,
o.User_Defined5,
o.User_Defined6,
o.User_Defined7,
o.User_Defined8,
o.User_Defined9,
o.User_Defined10,
o.User_Defined11,
o.Supplier_Code,
o.Supplier_Name,
o.Remark,
o.Create_By,
o.Create_Date,
o.Last_Update_By,
o.Last_Update_Date,
o.Active,
o.Enterprise_Id,
o.Enterprise_Code,
Order_Status,
User_Defined1,
User_Defined2,
User_Defined3,
User_Defined4,
User_Defined5,
User_Defined6,
User_Defined7,
User_Defined8,
User_Defined9,
User_Defined10,
User_Defined11,
Supplier_Code,
Supplier_Name,
Remark,
Create_By,
Create_Date,
Last_Update_By,
Last_Update_Date,
Active,
Enterprise_Id,
Enterprise_Code,
base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number
FROM
ods_procure_order as o LEFT JOIN base_product_attached
on o.Material_Code = base_product_attached.product_code </sql>
ods_procure_orde</sql>
<select id="selectOdsProcureOrderList" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
<include refid="selectOdsProcureOrderVo"/>
@ -494,6 +493,82 @@
WHERE
card.User_Defined1= #{userDefined1}
</select>
<select id="selectOdsProcureOrderList1" parameterType="OdsProcureOrder" resultMap="OdsProcureOrderResult">
SELECT
o.Site_code,
o.ID,
o.Procure_Code,
o.Material_Code,
o.Material_Desc,
o.Plan_Date,
o.Plan_Number,
o.Unit,
COALESCE ( Reality_Number, 0 ) Reality_Number,
o.Order_Status,
o.User_Defined1,
o.User_Defined2,
o.User_Defined3,
o.User_Defined4,
o.User_Defined5,
o.User_Defined6,
o.User_Defined7,
o.User_Defined8,
o.User_Defined9,
o.User_Defined10,
o.User_Defined11,
o.Supplier_Code,
o.Supplier_Name,
o.Remark,
o.Create_By,
o.Create_Date,
o.Last_Update_By,
o.Last_Update_Date,
o.Active,
o.Enterprise_Id,
o.Enterprise_Code,
base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number
FROM
ods_procure_order as o LEFT JOIN base_product_attached
on o.Material_Code = '0000000'+base_product_attached.product_code
<where>
<if test="siteCode != null and siteCode != ''">and o.Site_code = #{siteCode}</if>
<if test="ID != null and ID != ''">and o.ID = #{ID}</if>
<if test="procureCode != null and procureCode != ''">and o.Procure_Code = #{procureCode}</if>
<if test="materialCode != null and materialCode != ''">and o.Material_Code like concat('%', #{materialCode},
'%') </if>
<if test="materialDesc != null and materialDesc != ''">and o.Material_Desc = #{materialDesc}</if>
<if test="planDate != null ">and o.Plan_Date = #{planDate}</if>
<if test="planNumber != null ">and o.Plan_Number = #{planNumber}</if>
<if test="Unit != null and Unit != ''">and o.Unit = #{Unit}</if>
<if test="realityNumber != null ">and o.Reality_Number = #{realityNumber}</if>
<if test="orderStatus != null and orderStatus != ''">and o.Order_Status = #{orderStatus}</if>
<if test="userDefined1 != null and userDefined1 != ''">and o.User_Defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''">and o.User_Defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''">and o.User_Defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''">and o.User_Defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''">and o.User_Defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''">and o.User_Defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''">and o.User_Defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''">and o.User_Defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''">and o.User_Defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''">and o.User_Defined10 = #{userDefined10}</if>
<if test="userDefined11 != null and userDefined11 != ''">and o.User_Defined11 = #{userDefined11}</if>
<if test="supplierCode != null and supplierCode != ''">and o.Supplier_Code = #{supplierCode}</if>
<if test="supplierName != null and supplierName != ''">and o.Supplier_Name like concat('%', #{supplierName},
'%')
</if>
<if test="Remark != null and Remark != ''">and o.Remark = #{Remark}</if>
<if test="createBy != null and createBy != ''">and o.Create_By = #{createBy}</if>
<if test="createDate != null ">and o.Create_Date = #{createDate}</if>
<if test="lastUpdateBy != null and lastUpdateBy != ''">and o.Last_Update_By = #{lastUpdateBy}</if>
<if test="lastUpdateDate != null ">and o.Last_Update_Date = #{lastUpdateDate}</if>
<if test="Active != null and Active != ''">and o.Active = #{Active}</if>
<if test="enterpriseId != null and enterpriseId != ''">and o.Enterprise_Id = #{enterpriseId}</if>
<if test="enterpriseCode != null and enterpriseCode != ''">and o.Enterprise_Code = #{enterpriseCode}</if>
<if test="palletNum != null and palletNum != ''">and pallet_num = #{palletNum}</if>
</where>
order by Create_Date desc
</select>
<update id="updateodsProcureOrderCard">
update ods_procure_order_card
SET User_Defined10 = '1'

Write Preview
Loading…
Cancel
Save