UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

器械扫码拆零问题

Browse Source
dev_no_inv
yewj 1 year ago committed by qyt
parent 1c5dc20b2a
commit c64be1d921
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -414,7 +414,6 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
collectOrderBizService.saveOrUpdate(collectOrderBiz); collectOrderBizService.saveOrUpdate(collectOrderBiz);
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) { if (StrUtil.isEmpty(udiEntity.getSerialNo()) && exitCode != null) {
exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + scanCount); exitCode.setScanCount(IntUtil.value(exitCode.getScanCount()) + scanCount);
exitCode.setBizIdFk(collectOrderBiz.getId()); exitCode.setBizIdFk(collectOrderBiz.getId());
@ -436,6 +435,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
.updateTime(new Date()) .updateTime(new Date())
.updateUser(userId) .updateUser(userId)
.scanCount(scanCount) .scanCount(scanCount)
.scanActCount(scanCount)
.build(); .build();
this.save(collectOrderCodeMan); this.save(collectOrderCodeMan);
} }

43
src/main/java/com/glxp/api/service/inout/IoSplitCodeService.java
Unescape Escape View File

@ -255,7 +255,7 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
//判断拆零表里是否存在，如果存在则剔除 //判断拆零表里是否存在，如果存在则剔除
IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(collectOrderCodeMan.getUdiCode(), putWorkPlaceCode); IoSplitCodeEntity splitCodeEntity = splitCodeService.findByCode(collectOrderCodeMan.getUdiCode(), putWorkPlaceCode);
if (splitCodeEntity != null && IntUtil.value(splitCodeEntity.getRemainCount()) > 0) { if (splitCodeEntity != null && IntUtil.value(splitCodeEntity.getRemainCount()) > 0) {
if (IntUtil.value(splitCodeEntity.getRemainCount()) > IntUtil.value(collectOrderCodeMan.getScanCount())) { if (IntUtil.value(splitCodeEntity.getRemainCount()) > IntUtil.value(collectOrderCodeMan.getScanActCount())) {
splitCodeEntity.setRemainCount(IntUtil.value(splitCodeEntity.getRemainCount()) - IntUtil.value(collectOrderCodeMan.getScanActCount())); splitCodeEntity.setRemainCount(IntUtil.value(splitCodeEntity.getRemainCount()) - IntUtil.value(collectOrderCodeMan.getScanActCount()));
} else { } else {
splitCodeEntity.setRemainCount(0); splitCodeEntity.setRemainCount(0);
@ -299,25 +299,28 @@ public class IoSplitCodeService extends ServiceImpl<IoSplitCodeMapper, IoSplitCo
result = firstMatch1.get(); result = firstMatch1.get();
} }
} }
IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode()) if (result != null) {
.errUdiCode(result.getUdiCode()) IoSplitCodeEntity ioSplitCodeEntity = IoSplitCodeEntity.builder().code(result.getUdiCode())
.orderId(result.getOrderIdFk()) .errUdiCode(result.getUdiCode())
.action(collectOrder.getBusType()) .orderId(result.getOrderIdFk())
.relId(result.getRelId()) .action(collectOrder.getBusType())
.nameCode(result.getNameCode()) .relId(result.getRelId())
.batchNo(result.getBatchNo()) .nameCode(result.getNameCode())
.produceDate(result.getProductDate()) .batchNo(result.getBatchNo())
.expireDate(result.getExpireDate()) .produceDate(result.getProductDate())
.serialNo(result.getSerialNo()) .expireDate(result.getExpireDate())
.scanCount(result.getScanCount()) .serialNo(result.getSerialNo())
.totalCount(result.getScanCount()) .scanCount(result.getScanCount())
.workPlaceCode(putWorkPlaceCode) .totalCount(result.getScanCount())
.status(2) .workPlaceCode(putWorkPlaceCode)
.fifoSplit(1) .status(2)
.createTime(new Date()).updateTime(new Date()) .fifoSplit(1)
.remainCount(-unTagCount).build(); .createTime(new Date()).updateTime(new Date())
this.decorateUnpackExpireTime(ioSplitCodeEntity); .remainCount(-unTagCount).build();
splitCodeService.save(ioSplitCodeEntity); this.decorateUnpackExpireTime(ioSplitCodeEntity);
splitCodeService.save(ioSplitCodeEntity);
}
} }
} }

Write Preview
Loading…
Cancel
Save