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

成品入库修改2

Browse Source
master
mengjiao 6 months ago
parent 6a4bafb889
commit c22d391d1b
3 changed files with 123 additions and 0 deletions
Show Stats Download Patch File Download Diff File

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

@ -323,6 +323,14 @@ public class WmsToWCSmissionController {
public AjaxResult WmsProductPutByWorkOrderConfirm(@RequestBody WmsProductPut wmsProductPut) {
return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderConfirm(wmsProductPut));
}
/**
* 成品
* 新手持接口：确认
*/
@PostMapping("/WmsProductPutByWorkOrderConfirmT")
public AjaxResult WmsProductPutByWorkOrderConfirmT(@RequestBody WmsProductPut wmsProductPut) {
return AjaxResult.success(wmsProductPutService.WmsProductPutByWorkOrderConfirmT(wmsProductPut));
}
/**

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

@ -142,4 +142,6 @@ public interface IWmsProductPutService {
WmsProductPut WmsProductPutByWorkOrderqueryBS(WmsProductPut wmsProductPut);
ProOrderWorkorder finishedProductProductionRecordscar(ProOrderWorkorder proOrderWorkorder);
String WmsProductPutByWorkOrderConfirmT(WmsProductPut wmsProductPutList);
}

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

@ -1087,6 +1087,119 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
return proOrderWorkorder;
}
@Override
public String WmsProductPutByWorkOrderConfirmT(WmsProductPut wmsProductPut) {
// whCode
// waCode
// factoryCode
DynamicDataSourceContextHolder.push("ds_" + wmsProductPut.getFactoryCode());
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
Date date = new Date();
String formattedDate = dateFormat.format(date);//批次
List<WmsProductPut> wmsProductPutList = wmsProductPut.getWmsProductPut();//前端下栏保存的数据
String SUCCESS = "操作成功";
for (WmsProductPut wmsProductPut1 :
wmsProductPutList) {
//根据下面的记录--先查询对应订单，如果有原来的订单的话，就在原来的订单上进行修改，如果没有就先插入，如果有就修改数量
WmsProductPut wmsProductPutk = new WmsProductPut();
//wms_product_put
wmsProductPutk.setWorkOrder(wmsProductPut1.getWorkOrder());
wmsProductPutk.setProductOrder(wmsProductPut1.getProductOrder());
wmsProductPutk.setFactoryCode(wmsProductPut1.getFactoryCode());
wmsProductPutk.setWhCode(wmsProductPut1.getWhCode());//仓库编码
wmsProductPutk.setWaCode(wmsProductPut1.getWaCode());//仓库编码
wmsProductPutk.setProductName(wmsProductPut1.getProductName());
wmsProductPutk.setProductCode(wmsProductPut1.getProductCode());
wmsProductPutk.setPlanQuantity(wmsProductPut1.getPlanQuantity());
wmsProductPutk.setUnitOfMeasure(wmsProductPut1.getUnitOfMeasure());
wmsProductPutk.setBatchNumber(wmsProductPut1.getBatchNumber());//
List<WmsProductPut> wmsProductPutLists= wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk);
if (wmsProductPutLists.size()>0){//有
WmsProductPut wmsProductPut2= wmsProductPutLists.get(0);
BigDecimal planQuantity= wmsProductPut2.getPlanQuantity();
BigDecimal putQuantity= wmsProductPut2.getPutQuantity();
if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){
wmsProductPutk.setStatus("2");
}else {
wmsProductPutk.setStatus("1");
}
BigDecimal putQuantityT=putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量
wmsProductPut2.setPutQuantity(putQuantityT);
wmsProductPut2.setUpdateTime(new Date());
wmsProductPut2.setUpdateBy(wmsProductPut.getCreateBy());
wmsProductPutMapper.updateWmsProductPut(wmsProductPut2);
}else {
wmsProductPutk.setStatus("1");
wmsProductPutk.setSapStatus("0");
wmsProductPutk.setAttr3(formattedDate);//
wmsProductPutk.setCreateBy(wmsProductPut.getCreateBy());
wmsProductPutk.setCreateTime(new Date());
wmsProductPutk.setPutQuantity(new BigDecimal(wmsProductPut1.getNumber()));
wmsProductPutk.setId(IdUtils.fastSimpleUUID());
wmsProductPutMapper.insertWmsProductPut(wmsProductPutk);
}
WmsProductPutRecords wmsProductPutRecords = new WmsProductPutRecords();
wmsProductPutRecords.setWorkOrder(wmsProductPut1.getWorkOrder());
wmsProductPutRecords.setProductOrder(wmsProductPut1.getProductOrder());
wmsProductPutRecords.setProductName(wmsProductPut1.getProductName());
wmsProductPutRecords.setProductCode(wmsProductPut1.getProductCode());
wmsProductPutRecords.setWhCode(wmsProductPut1.getWhCode());//仓库编码
wmsProductPutRecords.setWaCode(wmsProductPut1.getWaCode());//仓库编码
wmsProductPutRecords.setId(IdUtils.fastSimpleUUID());
wmsProductPutRecords.setWlCode(wmsProductPut1.getWlCode());
wmsProductPutRecords.setSn(wmsProductPut1.getSn());
wmsProductPutRecords.setNumber(wmsProductPut1.getNumber());
wmsProductPutRecords.setCreateBy(wmsProductPut.getCreateBy());
wmsProductPutRecords.setCreateTime(new Date());
wmsProductPutRecordsMapper.insertWmsProductPutRecords(wmsProductPutRecords);
//wms_fp_storage_news_sn
WmsFpStorageNewsSn wmsFpStorageNewsSn = new WmsFpStorageNewsSn();
wmsFpStorageNewsSn.setStorageId(IdUtils.fastSimpleUUID());
wmsFpStorageNewsSn.setFactoryCode(wmsProductPut.getFactoryCode());
wmsFpStorageNewsSn.setWhCode(wmsProductPut1.getWhCode());//仓库编码
wmsFpStorageNewsSn.setWlCode(wmsProductPut1.getWlCode());
wmsFpStorageNewsSn.setOrderNo(wmsProductPutk.getId());
wmsFpStorageNewsSn.setProductCode(wmsProductPut1.getProductCode());
wmsFpStorageNewsSn.setProductName(wmsProductPut1.getProductName());
wmsFpStorageNewsSn.setSn(wmsProductPut1.getSn());
wmsFpStorageNewsSn.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
wmsFpStorageNewsSn.setBatchNumber(wmsProductPut1.getBatchNumber());
//wmsFpStorageNewsSn.setUserDefined2(formattedDate);
wmsFpStorageNewsSn.setCreateBy(wmsProductPut.getCreateBy());
wmsFpStorageNewsSn.setCreateTime(new Date());
wmsFpStorageNewsSn.setActiveFlag("1");
wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSn(wmsFpStorageNewsSn);
// wms_fp_storage_news
WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews();
wmsFpStorageNews.setWhCode(wmsProductPut1.getWhCode());//仓库编码
wmsFpStorageNews.setWlCode(wmsProductPut1.getWaCode());
wmsFpStorageNews.setStorageType("成品");
wmsFpStorageNews.setProductCode(wmsProductPut1.getProductCode());
wmsFpStorageNews.setProductName(wmsProductPut1.getProductName());
wmsFpStorageNews.setFactoryCode(wmsProductPut1.getFactoryCode());
wmsFpStorageNews.setActiveFlag("1");
wmsFpStorageNews.setUserDefined1(wmsProductPut1.getUnitOfMeasure());
List<WmsFpStorageNews> wmsFpStorageNewsList = wmsFpStorageNewsMapper.selectWmsFpStorageNewsList(wmsFpStorageNews);
wmsFpStorageNews.setStorageId(IdUtils.fastSimpleUUID());
wmsFpStorageNews.setAmount(new BigDecimal(wmsProductPut1.getNumber()));
wmsFpStorageNews.setCreateBy(wmsProductPut.getCreateBy());
wmsFpStorageNews.setCreateTime(new Date());
if (wmsFpStorageNewsList.size() > 0) {
WmsFpStorageNews wmsFpStorageNews1 = wmsFpStorageNewsList.get(0);
BigDecimal amount = wmsFpStorageNews1.getAmount();
BigDecimal amountAdd = amount.add(wmsFpStorageNews.getAmount());
wmsFpStorageNews1.setAmount(amountAdd);
wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews1);
} else {
wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews);
}
}
return SUCCESS;
}
@Override
public List<WmsRuturnPutEmbryo> FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode());

Write Preview
Loading…
Cancel
Save