wms页面修改

master
mengjiao 4 months ago
parent 991307491a
commit f1d3595e79

@ -3,6 +3,7 @@ package com.op.wms.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.op.wms.domain.ProOrderWorkorder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -95,4 +96,5 @@ public class WmsOdsWhiteEmbryoInController extends BaseController {
} }
} }

@ -117,7 +117,7 @@ public class WmsToWCSmissionController {
} }
/** /**
* -- * ----
*/ */
@PostMapping("/PurchaseOrderdeliPdaConfirm") @PostMapping("/PurchaseOrderdeliPdaConfirm")

@ -137,6 +137,16 @@ public class WmsOdsMateStorageNewsSn extends BaseEntity {
*/ */
@Excel(name = "备用5") @Excel(name = "备用5")
private String userDefined5; private String userDefined5;
@Excel(name = "备用5")
private String status;
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
/** /**
* 6 * 6

@ -2,6 +2,7 @@ package com.op.wms.service;
import java.util.List; import java.util.List;
import com.op.wms.domain.ProOrderWorkorder;
import com.op.wms.domain.WmsOdsWhiteEmbryoIn; import com.op.wms.domain.WmsOdsWhiteEmbryoIn;
/** /**
@ -59,4 +60,5 @@ public interface IWmsOdsWhiteEmbryoInService {
*/ */
public int deleteWmsOdsWhiteEmbryoInByID(String ID); public int deleteWmsOdsWhiteEmbryoInByID(String ID);
} }

@ -3,10 +3,13 @@ package com.op.wms.service.impl;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map;
import com.alibaba.fastjson2.JSONArray;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.op.common.core.context.SecurityContextHolder; import com.op.common.core.context.SecurityContextHolder;
import com.op.common.core.utils.uuid.IdUtils; import com.op.common.core.utils.uuid.IdUtils;
import com.op.wms.domain.ProOrderWorkorder;
import com.op.wms.domain.Purcode; import com.op.wms.domain.Purcode;
import com.op.wms.mapper.PurcodeMapper; import com.op.wms.mapper.PurcodeMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -15,6 +18,10 @@ import com.op.wms.mapper.WmsOdsWhiteEmbryoInMapper;
import com.op.wms.domain.WmsOdsWhiteEmbryoIn; import com.op.wms.domain.WmsOdsWhiteEmbryoIn;
import com.op.wms.service.IWmsOdsWhiteEmbryoInService; import com.op.wms.service.IWmsOdsWhiteEmbryoInService;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
/** /**
* Service * Service
@ -115,6 +122,7 @@ public class WmsOdsWhiteEmbryoInServiceImpl implements IWmsOdsWhiteEmbryoInServi
return wmsOdsWhiteEmbryoInMapper.deleteWmsOdsWhiteEmbryoInByID(ID); return wmsOdsWhiteEmbryoInMapper.deleteWmsOdsWhiteEmbryoInByID(ID);
} }
@DS("#header.poolName") @DS("#header.poolName")
private String getPurcode(String factorycode, String orderType) { private String getPurcode(String factorycode, String orderType) {

@ -90,41 +90,16 @@
<select id="selectWmsOdsMateStorageNewsNEWSList" parameterType="WmsOdsMateStorageNews" <select id="selectWmsOdsMateStorageNewsNEWSList" parameterType="WmsOdsMateStorageNews"
resultMap="WmsOdsMateStorageNewsResult"> resultMap="WmsOdsMateStorageNewsResult">
SELECT DISTINCT SELECT DISTINCT
wms_ods_mate_storage_news.storage_id,
wms_ods_mate_storage_news.wh_code, 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_code,
wms_ods_mate_storage_news.material_desc, wms_ods_mate_storage_news.material_desc,
wms_ods_mate_storage_news.amount, SUM ( wms_ods_mate_storage_news.amount ) amount,
wms_ods_mate_storage_news.storage_amount, SUM ( wms_ods_mate_storage_news.storage_amount ) storage_amount,
wms_ods_mate_storage_news.occupy_amount, SUM ( wms_ods_mate_storage_news.occupy_amount ) 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_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.factory_code,
wms_ods_mate_storage_news.sap_factory_code, wms_ods_mate_storage_news.sap_factory_code,
wms_ods_mate_storage_news.wl_name , ods_procure_order_card.user_defined7
ods_procure_order.Procure_Code procureCode,
ods_procure_order.User_Defined5 poNo
FROM FROM
wms_ods_mate_storage_news 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_card on ods_procure_order_card.User_Defined1=wms_ods_mate_storage_news.wl_code
@ -151,7 +126,7 @@
<if test="userDefined4 != null and userDefined4 != ''">and wms_ods_mate_storage_news.user_defined4 = #{userDefined4}</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="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="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="userDefined7 != null and userDefined7 != ''">and ods_procure_order_card.user_defined7 = #{userDefined7}</if>
<if test="userDefined8 != null and userDefined8 != ''">and wms_ods_mate_storage_news.user_defined8 = #{userDefined8}</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="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="userDefined10 != null and userDefined10 != ''">and wms_ods_mate_storage_news.user_defined10 = #{userDefined10}</if>
@ -163,7 +138,16 @@
<if test="sapFactoryCode != null and sapFactoryCode != ''">and wms_ods_mate_storage_news.sap_factory_code = #{sapFactoryCode}</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> <if test="wlName != null and wlName != ''">and wms_ods_mate_storage_news.wl_name like concat('%', #{wlName}, '%')</if>
</where> </where>
order by wms_ods_mate_storage_news.gmt_create desc GROUP BY
wms_ods_mate_storage_news.wh_code,
wms_ods_mate_storage_news.material_code,
wms_ods_mate_storage_news.material_desc,
wms_ods_mate_storage_news.user_defined1,
wms_ods_mate_storage_news.factory_code,
wms_ods_mate_storage_news.sap_factory_code,
ods_procure_order_card.user_defined7
ORDER BY
ods_procure_order_card.user_defined7 DESC
</select> </select>
<select id="selectWmsOdsMateStorageNewslsList" parameterType="WmsOdsMateStorageNews" <select id="selectWmsOdsMateStorageNewslsList" parameterType="WmsOdsMateStorageNews"
resultMap="WmsOdsMateStorageNewsResult"> resultMap="WmsOdsMateStorageNewsResult">

@ -33,6 +33,8 @@
<result property="gmtModified" column="gmt_modified"/> <result property="gmtModified" column="gmt_modified"/>
<result property="activeFlag" column="active_flag"/> <result property="activeFlag" column="active_flag"/>
<result property="factoryCode" column="factory_code"/> <result property="factoryCode" column="factory_code"/>
<result property="outNumber" column="outNumber"/>
<result property="status" column="status"/>
<result property="sapFactoryCode" column="sap_factory_code"/> <result property="sapFactoryCode" column="sap_factory_code"/>
</resultMap> </resultMap>
@ -70,7 +72,12 @@
wms_ods_mate_storage_news_sn.active_flag, wms_ods_mate_storage_news_sn.active_flag,
wms_ods_mate_storage_news_sn.factory_code, wms_ods_mate_storage_news_sn.factory_code,
wms_ods_mate_storage_news_sn.sap_factory_code , wms_ods_mate_storage_news_sn.sap_factory_code ,
wms_ods_mate_storage_news_sn.out_number outNumber,
ods_procure_order.Procure_Code order_no, ods_procure_order.Procure_Code order_no,
CASE
WHEN out_number IS NOT NULL THEN '1'
ELSE '0'
END AS status,
ods_procure_order.User_Defined5 po_no ods_procure_order.User_Defined5 po_no
FROM FROM
wms_ods_mate_storage_news_sn wms_ods_mate_storage_news_sn

Loading…
Cancel
Save