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

wms查询页面修改

Browse Source
master
mengjiao 5 months ago
parent 848bc9082c
commit cfab9c2d69
6 changed files with 107 additions and 3 deletions
Show Stats Download Patch File Download Diff File

2
op-modules/op-sap/src/main/java/com/op/sap/service/impl/SapItemSyncImpl.java
Unescape Escape View File

@ -709,6 +709,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
// 首先检查表中是否有行
if (maraTable.getNumRows() > 0) {
// 遍历每一行
String mblnr = new String(); // 物料凭证编号
String mjahr = new String(); // 物料凭证年度
String zeile = new String(); // 物料凭证中的项目
@ -729,6 +730,7 @@ public class SapItemSyncImpl implements SapItemSyncService {
String MATDOCUMENTYEAR= new String();
String tem="0";
for (int i = 0; i < maraTable.getNumRows(); i++) {
maraTable.setRow(i);
mblnr = maraTable.getString("MBLNR"); // 物料凭证编号
mjahr = maraTable.getString("MJAHR"); // 物料凭证年度
zeile = maraTable.getString("ZEILE"); // 物料凭证中的项目

18
op-modules/op-wms/src/main/java/com/op/wms/domain/WmsOdsMateStorageNews.java
Unescape Escape View File

@ -47,6 +47,24 @@ public class WmsOdsMateStorageNews extends BaseEntity {
*/
@Excel(name = "库存类型：BC－包材")
private String storageType;
private String procureCode;
private String poNo;
public String getProcureCode() {
return procureCode;
}
public void setProcureCode(String procureCode) {
this.procureCode = procureCode;
}
public String getPoNo() {
return poNo;
}
public void setPoNo(String poNo) {
this.poNo = poNo;
}
/**
* 库位编码

2
op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsOdsMateStorageNewsMapper.java
Unescape Escape View File

@ -72,4 +72,6 @@ public interface WmsOdsMateStorageNewsMapper {
List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews);
WmsOdsMateStorageNews selectWmsOdsMateStorageNewsLSByStorageId(String storageId);
public List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewsNEWSList(WmsOdsMateStorageNews wmsOdsMateStorageNews);
}

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

@ -62,7 +62,7 @@ public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsS
@Override
@DS("#header.poolName")
public List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewsList(WmsOdsMateStorageNews wmsOdsMateStorageNews) {
return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsList(wmsOdsMateStorageNews);
return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsNEWSList(wmsOdsMateStorageNews);
}
/**

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

@ -752,8 +752,8 @@
</select>
<delete id="deleteBatchPallet" >
delete from ods_procure_order_card where ID in
<foreach item="list" collection="odsProcureOrder" open="(" separator="," close=")">
#{odsProcureOrder.ID}
<foreach item="item" collection="list" open="(" separator="," close=")">
#{item.ID}
</foreach>
</delete>
</mapper>

82
op-modules/op-wms/src/main/resources/mapper/wms/WmsOdsMateStorageNewsMapper.xml
Unescape Escape View File

@ -38,6 +38,8 @@
<result property="factoryCode" column="factory_code"/>
<result property="sapFactoryCode" column="sap_factory_code"/>
<result property="wlName" column="wl_name"/>
<result property="poNo" column="poNo"/>
<result property="procureCode" column="procureCode"/>
</resultMap>
<sql id="selectWmsOdsMateStorageNewsVo">
@ -83,6 +85,86 @@
</where>
order by gmt_create desc
</select>
<select id="selectWmsOdsMateStorageNewsNEWSList" parameterType="WmsOdsMateStorageNews"
resultMap="WmsOdsMateStorageNewsResult">
SELECT DISTINCT
wms_ods_mate_storage_news.storage_id,
wms_ods_mate_storage_news.wh_code,
wms_ods_mate_storage_news.region_code,
wms_ods_mate_storage_news.wa_code,
wms_ods_mate_storage_news.storage_type,
wms_ods_mate_storage_news.wl_code,
wms_ods_mate_storage_news.material_code,
wms_ods_mate_storage_news.material_desc,
wms_ods_mate_storage_news.amount,
wms_ods_mate_storage_news.storage_amount,
wms_ods_mate_storage_news.occupy_amount,
wms_ods_mate_storage_news.lpn,
wms_ods_mate_storage_news.product_batch,
wms_ods_mate_storage_news.receive_date,
wms_ods_mate_storage_news.product_date,
wms_ods_mate_storage_news.user_defined1,
wms_ods_mate_storage_news.user_defined2,
wms_ods_mate_storage_news.user_defined3,
wms_ods_mate_storage_news.user_defined4,
wms_ods_mate_storage_news.user_defined5,
wms_ods_mate_storage_news.user_defined6,
wms_ods_mate_storage_news.user_defined7,
wms_ods_mate_storage_news.user_defined8,
wms_ods_mate_storage_news.user_defined9,
wms_ods_mate_storage_news.user_defined10,
wms_ods_mate_storage_news.create_by,
wms_ods_mate_storage_news.gmt_create,
wms_ods_mate_storage_news.last_modified_by,
wms_ods_mate_storage_news.gmt_modified,
wms_ods_mate_storage_news.active_flag,
wms_ods_mate_storage_news.factory_code,
wms_ods_mate_storage_news.sap_factory_code,
wms_ods_mate_storage_news.wl_name ,
ods_procure_order.Procure_Code procureCode,
ods_procure_order.User_Defined5 poNo
FROM
wms_ods_mate_storage_news
LEFT JOIN ods_procure_order_card on ods_procure_order_card.User_Defined1=wms_ods_mate_storage_news.wl_code
LEFT JOIN ods_procure_order ON CAST(ods_procure_order.ID AS NVARCHAR) = ods_procure_order_card.User_Defined4
<where>
<if test="storageId != null and storageId != ''">and wms_ods_mate_storage_news.storage_id = #{storageId}</if>
<if test="whCode != null and whCode != ''">and wms_ods_mate_storage_news.wh_code = #{whCode}</if>
<if test="regionCode != null and regionCode != ''">and wms_ods_mate_storage_news.region_code = #{regionCode}</if>
<if test="waCode != null and waCode != ''">and wms_ods_mate_storage_news.wa_code = #{waCode}</if>
<if test="storageType != null and storageType != ''">and wms_ods_mate_storage_news.storage_type = #{storageType}</if>
<if test="wlCode != null and wlCode != ''">and wms_ods_mate_storage_news.wl_code = #{wlCode}</if>
<if test="materialCode != null and materialCode != ''">and wms_ods_mate_storage_news.material_code like concat('%', #{materialCode}, '%')</if>
<if test="materialDesc != null and materialDesc != ''">and wms_ods_mate_storage_news.material_desc = #{materialDesc}</if>
<if test="amount != null ">and wms_ods_mate_storage_news.amount = #{amount}</if>
<if test="storageAmount != null ">and wms_ods_mate_storage_news.storage_amount = #{storageAmount}</if>
<if test="occupyAmount != null ">and wms_ods_mate_storage_news.occupy_amount = #{occupyAmount}</if>
<if test="lpn != null and lpn != ''">and wms_ods_mate_storage_news.lpn = #{lpn}</if>
<if test="productBatch != null and productBatch != ''">and wms_ods_mate_storage_news.product_batch = #{productBatch}</if>
<if test="receiveDate != null ">and wms_ods_mate_storage_news.receive_date = #{receiveDate}</if>
<if test="productDate != null ">and wms_ods_mate_storage_news.product_date = #{productDate}</if>
<if test="userDefined1 != null and userDefined1 != ''">and wms_ods_mate_storage_news.user_defined1 = #{userDefined1}</if>
<if test="userDefined2 != null and userDefined2 != ''">and wms_ods_mate_storage_news.user_defined2 = #{userDefined2}</if>
<if test="userDefined3 != null and userDefined3 != ''">and wms_ods_mate_storage_news.user_defined3 = #{userDefined3}</if>
<if test="userDefined4 != null and userDefined4 != ''">and wms_ods_mate_storage_news.user_defined4 = #{userDefined4}</if>
<if test="userDefined5 != null and userDefined5 != ''">and wms_ods_mate_storage_news.user_defined5 = #{userDefined5}</if>
<if test="userDefined6 != null and userDefined6 != ''">and wms_ods_mate_storage_news.user_defined6 = #{userDefined6}</if>
<if test="userDefined7 != null and userDefined7 != ''">and wms_ods_mate_storage_news.user_defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''">and wms_ods_mate_storage_news.user_defined8 = #{userDefined8}</if>
<if test="userDefined9 != null and userDefined9 != ''">and wms_ods_mate_storage_news.user_defined9 = #{userDefined9}</if>
<if test="userDefined10 != null and userDefined10 != ''">and wms_ods_mate_storage_news.user_defined10 = #{userDefined10}</if>
<if test="gmtCreate != null ">and wms_ods_mate_storage_news.gmt_create = #{gmtCreate}</if>
<if test="lastModifiedBy != null and lastModifiedBy != ''">and wms_ods_mate_storage_news.last_modified_by = #{lastModifiedBy}</if>
<if test="gmtModified != null ">and wms_ods_mate_storage_news.gmt_modified = #{gmtModified}</if>
<if test="activeFlag != null and activeFlag != ''">and wms_ods_mate_storage_news.active_flag = #{activeFlag}</if>
<if test="factoryCode != null and factoryCode != ''">and wms_ods_mate_storage_news.factory_code = #{factoryCode}</if>
<if test="sapFactoryCode != null and sapFactoryCode != ''">and wms_ods_mate_storage_news.sap_factory_code = #{sapFactoryCode}</if>
<if test="wlName != null and wlName != ''">and wms_ods_mate_storage_news.wl_name like concat('%', #{wlName}, '%')</if>
</where>
order by wms_ods_mate_storage_news.gmt_create desc
</select>
<select id="selectWmsOdsMateStorageNewslsList" parameterType="WmsOdsMateStorageNews"
resultMap="WmsOdsMateStorageNewsResult">

Write Preview
Loading…
Cancel
Save