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 6c52e7de3f
commit 430dec322b
7 changed files with 208 additions and 63 deletions
Show Stats Download Patch File Download Diff File

10
op-modules/op-wms/src/main/java/com/op/wms/controller/WmsOdsMateStorageNewsController.java
Unescape Escape View File

@ -101,4 +101,14 @@ public class WmsOdsMateStorageNewsController extends BaseController {
String result= wmsOdsMateStorageNewsService.addBS(wmsOdsMateStorageNews);
return success(result);
}
/**
* 查询包材库存主表列表
*/
@GetMapping("/listls")
public TableDataInfo listls(WmsOdsMateStorageNews wmsOdsMateStorageNews) {
startPage();
List<WmsOdsMateStorageNews> list = wmsOdsMateStorageNewsService.selectWmsOdsMateStorageNewslsList(wmsOdsMateStorageNews);
return getDataTable(list);
}
}

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

@ -68,4 +68,8 @@ public interface WmsOdsMateStorageNewsMapper {
public WmsOdsMateStorageNews selectBaseProductByCode(WCSInventoryPlan wcsInventoryPlan);
public void updateWmsOdsMateStorageNewsUpdateStorageAmount(WmsOdsMateStorageNews wmsOdsMateStorageNews);
List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews);
WmsOdsMateStorageNews selectWmsOdsMateStorageNewsLSByStorageId(String storageId);
}

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

@ -60,4 +60,6 @@ public interface IWmsOdsMateStorageNewsService {
public int deleteWmsOdsMateStorageNewsByStorageId(String storageId);
String addBS(WmsOdsMateStorageNews wmsOdsMateStorageNews);
List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews);
}

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

@ -1,6 +1,7 @@
package com.op.wms.service.impl;
import java.io.IOException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@ -120,79 +121,97 @@ public class WmsOdsMateStorageNewsServiceImpl implements IWmsOdsMateStorageNewsS
String formattedDate = dateFormat.format(date);
List<OdsProcureOrder> dtos0= odsProcureOrderMapper.getIdCardByIdList(wmsOdsMateStorageNews.getStorageId());
if (dtos0.size()>0){
List<OdsProcureOrder> list = new ArrayList<>();
OdsProcureOrder odsProcureOrder= dtos0.get(0);
String userDefined10= wmsOdsMateStorageNews.getUserDefined10();//打印次数
int printCount = Integer.parseInt(userDefined10);
for (int i = 0; i < printCount; i++) {
// 将 odsProcureOrder 对象复制一份，并添加到列表中。
// 假设 OdsProcureOrder 类具有一个复制构造函数或 clone 方法来创建对象的副本。
list.add(odsProcureOrder);
}
String msg= dayin(list);
String msg= dayin(dtos0);
return msg;
}else {
WmsOdsMateStorageNews wmsOdsMateStorageNews1= wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsByStorageId(wmsOdsMateStorageNews.getStorageId());
WmsOdsMateStorageNews wmsOdsMateStorageNews1= wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewsLSByStorageId(wmsOdsMateStorageNews.getStorageId());
//标识卡就用id和物料码组成
List<OdsProcureOrder> list = new ArrayList<>();
List<OdsProcureOrder>dtos=new ArrayList<>();
OdsProcureOrder pw = new OdsProcureOrder();
pw.setSiteCode(wmsOdsMateStorageNews1.getFactoryCode());
pw.setProcureCode(wmsOdsMateStorageNews1.getMaterialCode());//
//pw.setUserDefined3(order.getUserDefined3());//行项目
pw.setMaterialCode(wmsOdsMateStorageNews1.getMaterialCode());
pw.setMaterialDesc(wmsOdsMateStorageNews1.getMaterialDesc());
pw.setPlanNumber(wmsOdsMateStorageNews1.getAmount());
pw.setSupplierCode(wmsOdsMateStorageNews1.getUserDefined2());
pw.setSupplierName(wmsOdsMateStorageNews1.getUserDefined3());
pw.setUserDefined8("2");
pw.setUserDefined7(formattedDate+wmsOdsMateStorageNews1.getMaterialCode());//批次
pw.setUserDefined10("0");//标识卡状态0是未收货的
pw.setUserDefined11(wmsOdsMateStorageNews1.getUserDefined4());
pw.setUserDefined4(wmsOdsMateStorageNews1.getStorageId());
pw.setUnit(wmsOdsMateStorageNews1.getUserDefined1());
pw.setCardNum("1");
// String dateString = pw.getUserDefined11().replace("-", "");
pw.setUserDefined1(pw.getMaterialCode()+"-"+wmsOdsMateStorageNews1.getStorageId()+"-"+pw.getCardNum());//采购单+行项目+类型+日期+板次
pw.setCreateTime(new Date());
pw.setActive("1");
dtos.add(pw);
BigDecimal pall = wmsOdsMateStorageNews1.getAmount();//总数
OdsProcureOrder pw = new OdsProcureOrder();
BigDecimal pn = new BigDecimal(wmsOdsMateStorageNews1.getUserDefined6());//每托
int i = 1;
while(pall.compareTo(BigDecimal.ZERO)>0){
pw = new OdsProcureOrder();
pw.setSiteCode(wmsOdsMateStorageNews1.getFactoryCode());
pw.setProcureCode(wmsOdsMateStorageNews1.getMaterialCode());//
//pw.setUserDefined3(order.getUserDefined3());//行项目
pw.setMaterialCode(wmsOdsMateStorageNews1.getMaterialCode());
pw.setMaterialDesc(wmsOdsMateStorageNews1.getMaterialDesc());
pw.setPlanNumber(wmsOdsMateStorageNews1.getAmount());
pw.setSupplierCode(wmsOdsMateStorageNews1.getUserDefined2());
pw.setSupplierName(wmsOdsMateStorageNews1.getUserDefined3());
pw.setUserDefined8("2");
pw.setUserDefined7(formattedDate+wmsOdsMateStorageNews1.getMaterialCode());//批次
pw.setUserDefined10("0");//标识卡状态0是未收货的
pw.setUserDefined11(wmsOdsMateStorageNews1.getUserDefined4());
pw.setUserDefined4(wmsOdsMateStorageNews1.getStorageId());
pw.setUnit(wmsOdsMateStorageNews1.getUserDefined1());
pw.setCardNum(String.valueOf(i++));
if(pall.compareTo(pn)<0) {//最后一托盘
pw.setPlanNumber(pall);
}else{
pw.setPlanNumber(pn);
}
// String dateString = pw.getUserDefined11().replace("-", "");
pw.setUserDefined1(pw.getMaterialCode()+"-"+wmsOdsMateStorageNews1.getStorageId()+"-"+pw.getCardNum());//采购单+行项目+类型+日期+板次
pw.setCreateTime(new Date());
pw.setActive("1");
dtos.add(pw);
pall = pall.subtract(pn);
}
odsProcureOrderMapper.addBatchPallet(dtos);
WmsOdsMateStorageNews wmsOdsMateStorageNews2=new WmsOdsMateStorageNews();
wmsOdsMateStorageNews2.setStorageId(wmsOdsMateStorageNews.getStorageId());
wmsOdsMateStorageNews2.setWlCode(pw.getUserDefined1());
wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNews(wmsOdsMateStorageNews2);
WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn();
wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID());
wmsOdsMateStorageNewsSn.setWhCode("WH02");//仓库编码
// wmsOdsMateStorageNewsSn.setWaCode(pw.getUserDefined1());
wmsOdsMateStorageNewsSn.setWlCode(pw.getUserDefined1());//库位编码-
wmsOdsMateStorageNewsSn.setMaterialCode(wmsOdsMateStorageNews1.getMaterialCode());
wmsOdsMateStorageNewsSn.setMaterialDesc(wmsOdsMateStorageNews1.getMaterialDesc());
wmsOdsMateStorageNewsSn.setSn(pw.getUserDefined1());
wmsOdsMateStorageNewsSn.setAmount(wmsOdsMateStorageNews1.getAmount());
wmsOdsMateStorageNewsSn.setCreateBy(SecurityUtils.getUsername());
wmsOdsMateStorageNewsSn.setGmtCreate(new Date());
wmsOdsMateStorageNewsSn.setUserDefined2(pw.getUserDefined7());//批次
wmsOdsMateStorageNewsSn.setUserDefined1("RK");
wmsOdsMateStorageNewsSn.setUserDefined3("1");//0是暂收，1是真收
wmsOdsMateStorageNewsSn.setFactoryCode(wmsOdsMateStorageNews1.getFactoryCode());
wmsOdsMateStorageNewsSn.setSapFactoryCode(wmsOdsMateStorageNews1.getFactoryCode());
wmsOdsMateStorageNewsSn.setActiveFlag("1");
wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn);
OdsProcureOrder odsProcureOrder= dtos.get(0);
String userDefined10= wmsOdsMateStorageNews.getUserDefined10();//打印次数
int printCount = Integer.parseInt(userDefined10);
for (int i = 0; i < printCount; i++) {
// 将 odsProcureOrder 对象复制一份，并添加到列表中。
// 假设 OdsProcureOrder 类具有一个复制构造函数或 clone 方法来创建对象的副本。
list.add(odsProcureOrder);
for (OdsProcureOrder order:dtos){
WmsOdsMateStorageNews wmsOdsMateStorageNews3 = new WmsOdsMateStorageNews();
wmsOdsMateStorageNews3.setStorageId(IdUtils.fastSimpleUUID());
wmsOdsMateStorageNews3.setWhCode("WH02");
wmsOdsMateStorageNews3.setWlCode(order.getUserDefined1());
//wmsOdsMateStorageNews3.setWaCode(odsProcureOutOrder.getWaCode());
wmsOdsMateStorageNews3.setAmount(order.getPlanNumber());
// wmsOdsMateStorageNews3.setStorageAmount(odsProcureOutOrder.getPlanNumber());
wmsOdsMateStorageNews3.setMaterialCode(order.getMaterialCode());
wmsOdsMateStorageNews3.setMaterialDesc(order.getMaterialDesc());
wmsOdsMateStorageNews3.setStorageType("BC");
wmsOdsMateStorageNews3.setCreateBy(SecurityUtils.getUsername());
wmsOdsMateStorageNews3.setGmtCreate(new Date());
wmsOdsMateStorageNews3.setActiveFlag("1");
wmsOdsMateStorageNews3.setFactoryCode(wmsOdsMateStorageNews1.getFactoryCode());
wmsOdsMateStorageNews3.setSapFactoryCode(wmsOdsMateStorageNews1.getFactoryCode());
wmsOdsMateStorageNews3.setUserDefined1(order.getUnit());//单位
wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews3);
WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn();
wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID());
wmsOdsMateStorageNewsSn.setWhCode("WH02");//仓库编码
// wmsOdsMateStorageNewsSn.setWaCode(pw.getUserDefined1());
wmsOdsMateStorageNewsSn.setWlCode(order.getUserDefined1());//库位编码-
wmsOdsMateStorageNewsSn.setMaterialCode(wmsOdsMateStorageNews1.getMaterialCode());
wmsOdsMateStorageNewsSn.setMaterialDesc(wmsOdsMateStorageNews1.getMaterialDesc());
wmsOdsMateStorageNewsSn.setSn(order.getUserDefined1());
wmsOdsMateStorageNewsSn.setAmount(order.getPlanNumber());
wmsOdsMateStorageNewsSn.setCreateBy(SecurityUtils.getUsername());
wmsOdsMateStorageNewsSn.setGmtCreate(new Date());
wmsOdsMateStorageNewsSn.setUserDefined2(order.getUserDefined7());//批次
wmsOdsMateStorageNewsSn.setUserDefined1("RK");
wmsOdsMateStorageNewsSn.setUserDefined3("1");//0是暂收，1是真收
wmsOdsMateStorageNewsSn.setFactoryCode(wmsOdsMateStorageNews1.getFactoryCode());
wmsOdsMateStorageNewsSn.setSapFactoryCode(wmsOdsMateStorageNews1.getFactoryCode());
wmsOdsMateStorageNewsSn.setActiveFlag("1");
wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn);
}
String msg= dayin(list);
String msg= dayin(dtos);
return msg;
}
}
@Override
@DS("#header.poolName")
public List<WmsOdsMateStorageNews> selectWmsOdsMateStorageNewslsList(WmsOdsMateStorageNews wmsOdsMateStorageNews) {
return wmsOdsMateStorageNewsMapper.selectWmsOdsMateStorageNewslsList(wmsOdsMateStorageNews);
}
public String dayin( List<OdsProcureOrder> orderList) {
// 定义请求的URL地址
String url = dayinUrl1;

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

@ -632,7 +632,7 @@
<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="planDate != null "> AND CAST(o.Plan_Date AS 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>

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

@ -82,12 +82,123 @@
<if test="wlName != null and wlName != ''">and wl_name like concat('%', #{wlName}, '%')</if>
</where>
</select>
<select id="selectWmsOdsMateStorageNewslsList" parameterType="WmsOdsMateStorageNews"
resultMap="WmsOdsMateStorageNewsResult">
SELECT
storage_id,
wh_code,
region_code,
wa_code,
storage_type,
wl_code,
material_code,
material_desc,
amount,
storage_amount,
occupy_amount,
lpn,
product_batch,
receive_date,
product_date,
user_defined1,
user_defined2,
user_defined3,
user_defined4,
user_defined5,
user_defined6,
user_defined7,
user_defined8,
user_defined9,
user_defined10,
create_by,
gmt_create,
last_modified_by,
gmt_modified,
active_flag,
factory_code,
sap_factory_code,
wl_name
FROM
wms_ods_mate_storage_news_copy1
<where>
<if test="storageId != null and storageId != ''">and storage_id = #{storageId}</if>
<if test="whCode != null and whCode != ''">and wh_code = #{whCode}</if>
<if test="regionCode != null and regionCode != ''">and region_code = #{regionCode}</if>
<if test="waCode != null and waCode != ''">and wa_code = #{waCode}</if>
<if test="storageType != null and storageType != ''">and storage_type = #{storageType}</if>
<if test="wlCode != null and wlCode != ''">and wl_code = #{wlCode}</if>
<if test="materialCode != null and materialCode != ''">and material_code = #{materialCode}</if>
<if test="materialDesc != null and materialDesc != ''">and material_desc = #{materialDesc}</if>
<if test="amount != null ">and amount = #{amount}</if>
<if test="storageAmount != null ">and storage_amount = #{storageAmount}</if>
<if test="occupyAmount != null ">and occupy_amount = #{occupyAmount}</if>
<if test="lpn != null and lpn != ''">and lpn = #{lpn}</if>
<if test="productBatch != null and productBatch != ''">and product_batch = #{productBatch}</if>
<if test="receiveDate != null ">and receive_date = #{receiveDate}</if>
<if test="productDate != null ">and product_date = #{productDate}</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="gmtCreate != null ">and gmt_create = #{gmtCreate}</if>
<if test="lastModifiedBy != null and lastModifiedBy != ''">and last_modified_by = #{lastModifiedBy}</if>
<if test="gmtModified != null ">and gmt_modified = #{gmtModified}</if>
<if test="activeFlag != null and activeFlag != ''">and active_flag = #{activeFlag}</if>
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if>
<if test="sapFactoryCode != null and sapFactoryCode != ''">and sap_factory_code = #{sapFactoryCode}</if>
<if test="wlName != null and wlName != ''">and wl_name like concat('%', #{wlName}, '%')</if>
</where>
</select>
<select id="selectWmsOdsMateStorageNewsByStorageId" parameterType="String" resultMap="WmsOdsMateStorageNewsResult">
<include refid="selectWmsOdsMateStorageNewsVo"/>
where storage_id = #{storageId}
</select>
<select id="selectWmsOdsMateStorageNewsLSByStorageId" parameterType="String" resultMap="WmsOdsMateStorageNewsResult">
SELECT
storage_id,
wh_code,
region_code,
wa_code,
storage_type,
wl_code,
material_code,
material_desc,
amount,
storage_amount,
occupy_amount,
lpn,
product_batch,
receive_date,
product_date,
user_defined1,
user_defined2,
user_defined3,
user_defined4,
user_defined5,
user_defined6,
user_defined7,
user_defined8,
user_defined9,
user_defined10,
create_by,
gmt_create,
last_modified_by,
gmt_modified,
active_flag,
factory_code,
sap_factory_code,
wl_name
FROM
wms_ods_mate_storage_news_copy1
where storage_id = #{storageId}
</select>
<insert id="insertWmsOdsMateStorageNews" parameterType="WmsOdsMateStorageNews">
insert into wms_ods_mate_storage_news
<trim prefix="(" suffix=")" suffixOverrides=",">

1
op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInMapper.xml
Unescape Escape View File

@ -186,7 +186,6 @@
wms_raw_order_in.gmt_create,
wms_raw_order_in.last_modified_by,
wms_raw_order_in.gmt_modified,
wms_raw_order_in_sn.user_defined2 incomeBatchNo ,
wms_raw_order_in.active_flag
FROM
wms_raw_order_in

Write Preview
Loading…
Cancel
Save