rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
yf001217 2026-06-15 18:51:16 +08:00
parent ce5ddd8aad 8a0c901fe9
commit efd3df65db
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/controller/QmsController.java
View File

@ -184,7 +184,6 @@ public class QmsController extends BaseController {
// receiveItem.setMaterialDocYear(returnDto.getValue()); // receiveItem.setMaterialDocYear(returnDto.getValue());
inspect.setMaterialDoc105(returnDto.getKey()); inspect.setMaterialDoc105(returnDto.getKey());
inspect.setMaterialDocYear105(returnDto.getValue()); inspect.setMaterialDocYear105(returnDto.getValue());
qcReceiveItemService.updateById(receiveItem);
// 检查并更新收货单完成状态 // 检查并更新收货单完成状态
List<WmsQcReceiveItem> allItems = qcReceiveItemService.lambdaQuery() List<WmsQcReceiveItem> allItems = qcReceiveItemService.lambdaQuery()
@ -208,6 +207,8 @@ public class QmsController extends BaseController {
if (!Objects.equals(receive.getIsCheck(), (short) 2)) { if (!Objects.equals(receive.getIsCheck(), (short) 2)) {
receive.setIsCheck(isCheck); receive.setIsCheck(isCheck);
} }
qcReceiveItemService.updateById(receiveItem);
qcReceiveService.updateById(receive);
// qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), receiveItem.getMaterialDoc()); // qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), receiveItem.getMaterialDoc());
//更新二维码数量 //更新二维码数量
if (CollectionUtil.isNotEmpty(qo.getQrCodes())) { if (CollectionUtil.isNotEmpty(qo.getQrCodes())) {