lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lhq:9991cce1ff3ffbef43ccdac80b12a9676a810475
Branches Tags
lhq:master
...
compare: lhq:19229a949d7e234e01b36802ca03b92f7c58ebe9
Branches Tags
lhq:master

3 Commits
9991cce1ff ... 19229a949d

Author SHA1 Message Date
zj
19229a949d Merge remote-tracking branch 'origin/master' 2026-01-06 10:35:20 +08:00
zj
80ca8662c4 优化 2026-01-06 10:34:57 +08:00
zj
b6ec796ef5 优化 2026-01-05 21:23:24 +08:00
3 changed files with 13 additions and 45 deletions
Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -60,8 +60,8 @@ public class ToErpServiceImpl implements IToErpService {
ErpParameter<WipTransferDoc> objectErpParameter = new ErpParameter<>();
ArrayList<WipTransferDocD> list = new ArrayList<WipTransferDocD>();
WipTransferDoc wipTransferDoc = new WipTransferDoc();
wipTransferDoc.setDOC_NO(basJobIdService.getJobIdBy("5C21"));
wipTransferDoc.setDOC_ID_DOC_CODE("5C21");
wipTransferDoc.setDOC_NO(basJobIdService.getJobIdBy("5C41"));
wipTransferDoc.setDOC_ID_DOC_CODE("5C41");
wipTransferDoc.setDOC_DATE(DateUtil.formatDateTime(new Date()));
wipTransferDoc.setSOURCE_ID_WORK_CENTER_WORK_CENTER_CODE("QC06");
wipTransferDoc.setFROM_ADMIN_UNIT_ID_ADMIN_UNIT_CODE("EF08G");

39
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -113,7 +113,7 @@ public class ToWmsServiceImpl implements IToWmsService {
String nw = findFirst(PATTERNS.get("NW"), trayCode);
String gw = findFirst(PATTERNS.get("GW"), trayCode);;
// String productId = findFirst(PATTERNS.get("ITEM_CODE"), trayCode);
String productId = "KC01001000145";
String productId = "KC01001000327";
String bm = findFirst(PATTERNS.get("@"), trayCode);
bm=bm.substring(0,bm.length()-1);
String[] decode = ProcodeUtils.decode(bm);
@@ -167,30 +167,6 @@ public class ToWmsServiceImpl implements IToWmsService {
//创建作业标准
if ("1".equals(requestEnter.getFloor())) {
//一楼入库 其它入库 和 退料入库 存在单据，需要修改单据数量
// InStockin inStockinParam = new InStockin();
// inStockinParam.setErpBill(erpBill);
// List<InStockin> inStockins = inStockinService.selectInStockinListApi(inStockinParam);
// if (CollUtil.isEmpty(inStockins)) {
// return AjaxResult.error("单据不存在");
// }
// InStockin inStockin = inStockins.get(0);
// if ("1".equals(inStockin.getStatus()) || "2".equals(inStockin.getStatus())) {
// inStockin.setStatus("3");
// inStockinService.updateInStockin(inStockin);
// }
// inOrOutType = inStockin.getInType();
// inStockId = inStockin.getStockinId();
// InStockinDetail inStockinDetailParam = new InStockinDetail();
// inStockinDetailParam.setStockinId(inStockin.getStockinGuid());
// inStockinDetailParam.setProductId(basProduct.getProductId());
// List<InStockinDetail> inStockinDetails = inStockinDetailService.selectInStockinDetailList(inStockinDetailParam);
// if (CollUtil.isEmpty(inStockinDetails)) {
// return AjaxResult.error("单据明细不存在");
// }
// InStockinDetail inStockinDetail = inStockinDetails.get(0);
// inStockDetailId = inStockinDetail.getStockinDetailId();
// inStockinDetail.setScanNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getScanNum()).add(Convert.toBigDecimal(1))));
// inStockinDetailService.updateInStockinDetail(inStockinDetail);
inOrOutType = "2";
}else if ("2".equals(requestEnter.getFloor())) {
inOrOutType = "1";
@@ -264,13 +240,12 @@ public class ToWmsServiceImpl implements IToWmsService {
}
//todo 创建工艺入库单
// if ("2".equals(requestEnter.getFloor())){
// AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
// if (!workshopInboundOrder.isSuccess()){
// //throw new RuntimeException("创建工单失败");
// return new AjaxResult(9, "创建工艺入库单失败！");
// }
// }
if ("2".equals(requestEnter.getFloor())){
AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
if (!workshopInboundOrder.isSuccess()){
throw new RuntimeException("创建工单失败");
}
}
//修改作业状态为正执行
result.put("jobId", mydoJob.getJobId());

15
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -189,9 +189,9 @@ public class MydoJobServiceImpl implements IMydoJobService {
if (job == null) {
return AjaxResult.warn("任务不存在");
}
if (!"1".equals(job.getStatus())) {
return AjaxResult.warn("只能作废未开始的任务");
}
// if (!"1".equals(job.getStatus())) {
// return AjaxResult.warn("只能作废未开始的任务");
// }
if ("1".equals(job.getInOrOut())) {
mydoJob.setStatus("5");
updateMydoJob(mydoJob);
@@ -321,13 +321,6 @@ public class MydoJobServiceImpl implements IMydoJobService {
if (CollUtil.isNotEmpty(mydoJobDetails)) {
List<BasStock> list = new ArrayList<>();
for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
// if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) {
// //修改单据实际数量 2-退料入库 3-其它入库
// String inOrOutDId = mydoJobDetail.getInOrOutDId();
// InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
// inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity()))));
// inStockinDetailService.updateInStockinDetail(inStockinDetail);
// }
//正常库存
BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
stockByInStockinDetail.setSpare7("0");
@@ -363,7 +356,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
}
transferBillCallback.setSpare3(mydoJobDetails.get(0).getSpec());
transferBillCallback.setTrayCode(mydoJob.getTrayCode());
//transferBillCallbackService.insertTransferBillCallback(transferBillCallback);
transferBillCallbackService.insertTransferBillCallback(transferBillCallback);
return AjaxResult.success();
} else {
return AjaxResult.warn("不存在子作业");