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

wms修改1

Browse Source
master
mengjiao 4 months ago
parent 561d15680c
commit 5c49d63444
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -1244,11 +1244,19 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
odsProcureOrderMapper.addBatchPallet(dtos);
}
}
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String date = dateFormat.format(currentDate);
for (OdsProcureOrder order1:
dtos ) {
String materialCode= order1.getMaterialCode();//000000040000004873
materialCode = materialCode.replaceFirst("^0{7}", ""); // 只替换开头的7个0
order1.setMaterialCode(materialCode);
order1.setUserDefined11(date);
}
String msg= dayin(dtos);
return msg;
@ -1290,11 +1298,17 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
dtos.add(order1);
odsProcureOrderMapper.addBatchPallet(dtos);
Date currentDate = new Date();
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
String date = dateFormat.format(currentDate);
for (OdsProcureOrder odsProcureOrder1:
dtos ) {
String materialCode= odsProcureOrder1.getMaterialCode();//000000040000004873
materialCode = materialCode.replaceFirst("^0{7}", ""); // 只替换开头的7个0
odsProcureOrder1.setMaterialCode(materialCode);
odsProcureOrder1.setUserDefined11(date);
}
String resylt= dayin(dtos);
// resylt
@ -2299,6 +2313,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
}else{
dtos.addAll(dtos0);
}
for (OdsProcureOrder order1:
dtos ) {
String materialCode= order1.getMaterialCode();//000000040000004873
@ -2436,6 +2451,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
String result="操作成功";
String factoryCode = orderList.get(0).getFactoryCode();
DynamicDataSourceContextHolder.push("ds_" + factoryCode);
//我可以在这个循环里面
for (OdsProcureOutOrder odsProcureOutOrder :
orderList) {
//领料单，物料编号，领料单批次，物料名称，托盘号，出库数量，库位号，
@ -2451,11 +2467,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
BigDecimal amount= odsProcureOutOrder.getAmount();//数量
String userDefined1= odsProcureOutOrder.getUserDefined1();//单位
String userDefined2= odsProcureOutOrder.getUserDefined2();//批次
//包材明细表
WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnByMateOrderInSnIdk(mateOrderInSnId);
//wms_raw_mission_out--保存
//ods_procure_out_order--修改
WCSInventoryPlan wcsInventoryPlan = new WCSInventoryPlan();
wcsInventoryPlan.setSku(odsProcureOutOrder.getMaterialCode());
// WCSInventoryPlan wcsInventoryPlan = new WCSInventoryPlan();
// wcsInventoryPlan.setSku(odsProcureOutOrder.getMaterialCode());
// WmsOdsMateStorageNews wmsOdsMateStorageNews = wmsOdsMateStorageNewsMapper.selectBaseProductByCode(wcsInventoryPlan);
OdsProcureOutOrder order = new OdsProcureOutOrder();
order.setProduceCode(produceCode);//领料单
@ -2473,14 +2490,14 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
order.setActive("1");
order.setCreateBy(createBy);
order.setCreateDate(new Date());
//order.setSiteCode(factoryCode);
OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder();
odsProcureOutOrder1.setProduceCode(produceCode);
odsProcureOutOrder1.setMaterialCode(materialCode);
List<OdsProcureOutOrder> odsProcureOutOrders = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder1);
//包材出库单----会有特殊的那种二次过账的单子--就看前端会不会传对应的标识卡了
OdsProcureOutOrder order1= odsProcureOutOrders.get(0);
order.setUserDefined4(order1.getUserDefined4());
//出库明细
odsProcureOutOrderMapper.insertWmsRawMissionOut(order);
BigDecimal realityNumber1 = order1.getOutNumber();//累出库数
@ -2488,17 +2505,17 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
BigDecimal planNumber = amount;//本次实际数量
BigDecimal tem = realityNumber1.add(planNumber);
if (tem.compareTo(realityNumber)>= 0) {
order1.setOrderStatus("3");
order1.setOrderStatus("3");//3是满足出库数量
} else {
order1.setOrderStatus("2");
}
order1.setOutNumber(tem);
odsProcureOutOrderMapper.updateWmsOdsProcureOutOrder(order1);//订单修改
odsProcureOutOrderMapper.updateWmsOdsProcureOutOrder(order1);//订单修改--会超
//明细
// BigDecimal temk= wmsOdsMateStorageNewsSn.getAmount().subtract(amount);
wmsOdsMateStorageNewsSn.setOutNumber(amount);
wmsOdsMateStorageNewsSn.setLastModifiedBy(createBy);
wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnAddoutNumber(wmsOdsMateStorageNewsSn);//库存明细
wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnAddoutNumber(wmsOdsMateStorageNewsSn);//库存明细--包材库存
WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews();
wmsOdsEmStorageNews.setWhCode(wmsOdsMateStorageNewsSn.getWhCode());//仓库编码
wmsOdsEmStorageNews.setWlCode(wmsOdsMateStorageNewsSn.getWlCode());//库位编码
@ -2513,6 +2530,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
OdsProcureOutOrder order=new OdsProcureOutOrder();
List<OdsProcureOutOrder> orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByOrderStatus(order);
//完成的。没有进行过账的
if (orderList1.size()>0){
OutboundPostingzcSAPGY(orderList1);
}

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

@ -563,6 +563,7 @@
card.User_Defined1 sn,
card.Plan_Number ,
card.User_Defined10,
card.User_Defined9,
card.User_Defined1,
order_TME.User_Defined5
FROM

3
op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml
Unescape Escape View File

@ -1308,7 +1308,8 @@
</select>
<select id="selectMesReportWorkConsumeFC" resultMap="OdsProcureOutOrderResult">
select
sum(mco.quantity) Plan_Number
ISNULL(sum(mco.quantity), 0) AS Plan_Number
from pro_order_workorder ow
left join mes_prepare mp on ow.workorder_code = mp.workorder_code
left join mes_prepare_detail mpd on mp.prepare_id = mpd.prepare_id

Write Preview
Loading…
Cancel
Save