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

wms成品调拨部分代码修改29

Browse Source
master
mengjiao 10 months ago
parent cff213a3d0
commit 5abd5d3bb7
5 changed files with 108 additions and 4 deletions
Show Stats Download Patch File Download Diff File

17
op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java
Unescape Escape View File

@ -347,8 +347,23 @@ public class WmsToWCSmissionController {
public AjaxResult confirmFinishedProductTransferAndOutbound(@RequestBody WmsAllocationOutEmbryo wmsRuturnPutEmbryo) {
return AjaxResult.success(wmsProductPutService.confirmFinishedProductTransferAndOutbound(wmsRuturnPutEmbryo));
}
/**
* 成品库内转储--托盘扫码
*
*/
@PostMapping("/palletScanning")
public AjaxResult palletScanning(@RequestBody WmsFpStorageNewsSn wmsFpStorageNewsSn) {
return AjaxResult.success(wmsProductPutService.palletScanning(wmsFpStorageNewsSn));
}
/**
* 成品库内转储--托盘移库确认
*
*/
@PostMapping("/palletTransferConfirmation")
public AjaxResult palletTransferConfirmation(@RequestBody WmsFpStorageNewsSn wmsFpStorageNewsSn) {
return AjaxResult.success(wmsProductPutService.palletTransferConfirmation(wmsFpStorageNewsSn));
}
/**
* 手持白胚入库查询
*/

15
op-modules/op-wms/src/main/java/com/op/wms/domain/WmsFpStorageNewsSn.java
Unescape Escape View File

@ -41,6 +41,21 @@ public class WmsFpStorageNewsSn extends BaseEntity {
@Excel(name = "库位编码")
private String wlCode;
/**
* 库位编码
*/
@Excel(name = "目标库位编码")
private String towlCode;
public String getTowlCode() {
return towlCode;
}
public void setTowlCode(String towlCode) {
this.towlCode = towlCode;
}
/**
* 入库单号
*/

4
op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java
Unescape Escape View File

@ -122,4 +122,8 @@ public interface IWmsProductPutService {
List<WmsAllocationOutEmbryo> selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo);
String confirmFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo);
WmsFpStorageNewsSn palletScanning(WmsFpStorageNewsSn wmsFpStorageNewsSn);
String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn);
}

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

@ -231,7 +231,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsFpStorageNewsSn.setSn(wmsProductPut1.getSn());
wmsFpStorageNewsSn.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber());
wmsFpStorageNewsSn.setUserDefined2(formattedDate);
//wmsFpStorageNewsSn.setUserDefined2(formattedDate);
wmsFpStorageNewsSn.setCreateBy(wmsProductPut.getCreateBy());
wmsFpStorageNewsSn.setCreateTime(new Date());
wmsFpStorageNewsSn.setActiveFlag("1");
@ -850,7 +850,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
wmsFpStorageNewsSn.setSn(wmsProductPut1.getSn());
wmsFpStorageNewsSn.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
//wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber());
wmsFpStorageNewsSn.setUserDefined2(formattedDate);
// wmsFpStorageNewsSn.setUserDefined2(formattedDate);
wmsFpStorageNewsSn.setCreateBy(wmsRuturnPutEmbryo.getCreateBy());
wmsFpStorageNewsSn.setCreateTime(new Date());
wmsFpStorageNewsSn.setActiveFlag("1");
@ -945,4 +945,74 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
}
return result1;
}
@Override
public WmsFpStorageNewsSn palletScanning(WmsFpStorageNewsSn wmsFpStorageNewsSn) {
DynamicDataSourceContextHolder.push("ds_" + wmsFpStorageNewsSn.getFactoryCode());
wmsFpStorageNewsSn.setActiveFlag("1");
List<WmsFpStorageNewsSn> wmsFpStorageNewsSnList= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn);
if (wmsFpStorageNewsSnList.size()>0){
return wmsFpStorageNewsSnList.get(0);
}
return null;
}
@Override
public String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn) {
String result1="移库成功";
DynamicDataSourceContextHolder.push("ds_" + wmsFpStorageNewsSn.getFactoryCode());
String toWlCode=wmsFpStorageNewsSn.getTowlCode();
WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId());
//减库存明细
wmsFpStorageNewsSn1.setActiveFlag("0");
wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn1);
//减库存
WmsFpStorageNews wmsFpStorageNews= wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCodeAndWlCode(wmsFpStorageNewsSn.getProductCode(),wmsFpStorageNewsSn.getWlCode());
BigDecimal amount = wmsFpStorageNews.getAmount();
BigDecimal amountsub = amount.subtract(wmsFpStorageNewsSn1.getAmount());
wmsFpStorageNews.setAmount(amountsub);
wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews);
//添加库存明细
WmsFpStorageNewsSn wmsFpStorageNewsSn2 = new WmsFpStorageNewsSn();
wmsFpStorageNewsSn2.setStorageId(IdUtils.fastSimpleUUID());
wmsFpStorageNewsSn2.setFactoryCode(wmsFpStorageNewsSn.getFactoryCode());
wmsFpStorageNewsSn2.setWhCode(wmsFpStorageNewsSn.getWhCode());//仓库编码
wmsFpStorageNewsSn2.setWlCode(toWlCode);
wmsFpStorageNewsSn2.setProductCode(wmsFpStorageNewsSn.getProductCode());
wmsFpStorageNewsSn2.setProductName(wmsFpStorageNewsSn.getProductName());
wmsFpStorageNewsSn2.setSn(wmsFpStorageNewsSn.getSn());
wmsFpStorageNewsSn2.setAmount(wmsFpStorageNewsSn.getAmount());
//wmsFpStorageNewsSn.setBatchNumber(wmsProductPut.getBatchNumber());
// wmsFpStorageNewsSn2.setUserDefined2(formattedDate);
wmsFpStorageNewsSn2.setCreateBy(wmsFpStorageNewsSn.getCreateBy());
wmsFpStorageNewsSn2.setCreateTime(new Date());
wmsFpStorageNewsSn2.setActiveFlag("1");
wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn2);
//添加库存
WmsFpStorageNews wmsFpStorageNews1 = new WmsFpStorageNews();
wmsFpStorageNews1.setWhCode(wmsFpStorageNewsSn.getWhCode());//仓库编码
wmsFpStorageNews1.setWlCode(toWlCode);
wmsFpStorageNews1.setStorageType("成品");
wmsFpStorageNews1.setProductCode(wmsFpStorageNewsSn.getProductCode());
wmsFpStorageNews1.setProductName(wmsFpStorageNewsSn.getProductName());
wmsFpStorageNews1.setFactoryCode(wmsFpStorageNewsSn.getFactoryCode());
wmsFpStorageNews1.setActiveFlag("1");
wmsFpStorageNews1.setUserDefined1(wmsFpStorageNews.getUserDefined1());
List<WmsFpStorageNews> wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews1);
wmsFpStorageNews1.setStorageId(IdUtils.fastSimpleUUID());
wmsFpStorageNews1.setAmount(wmsFpStorageNewsSn.getAmount());
wmsFpStorageNews1.setCreateBy(wmsFpStorageNewsSn.getCreateBy());
wmsFpStorageNews1.setCreateTime(new Date());
if (wmsFpStorageNewsList.size() > 0) {
WmsFpStorageNews wmsFpStorageNews2 = wmsFpStorageNewsList.get(0);
BigDecimal amount1 = wmsFpStorageNews2.getAmount();
BigDecimal amountAdd = amount1.add(wmsFpStorageNews.getAmount());
wmsFpStorageNews2.setAmount(amountAdd);
wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews2);
} else {
wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews);
}
return result1;
}
}

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

@ -376,7 +376,7 @@
unit_of_measure,
lot_number,
plan_quantity,
out_quantity,
COALESCE(out_quantity, 0)
status,
SAP_status,
SAP_proof,

Write Preview
Loading…
Cancel
Save