Merge remote-tracking branch 'origin/qms/develop' into qms/develop
This commit is contained in:
commit
efd3df65db
|
|
@ -184,7 +184,6 @@ public class QmsController extends BaseController {
|
|||
// receiveItem.setMaterialDocYear(returnDto.getValue());
|
||||
inspect.setMaterialDoc105(returnDto.getKey());
|
||||
inspect.setMaterialDocYear105(returnDto.getValue());
|
||||
qcReceiveItemService.updateById(receiveItem);
|
||||
|
||||
// 检查并更新收货单完成状态
|
||||
List<WmsQcReceiveItem> allItems = qcReceiveItemService.lambdaQuery()
|
||||
|
|
@ -208,6 +207,8 @@ public class QmsController extends BaseController {
|
|||
if (!Objects.equals(receive.getIsCheck(), (short) 2)) {
|
||||
receive.setIsCheck(isCheck);
|
||||
}
|
||||
qcReceiveItemService.updateById(receiveItem);
|
||||
qcReceiveService.updateById(receive);
|
||||
// qcReceiveItemService.updateCheckNum(inspect.getInspectionQty(), inspect.getNoteNum(), inspect.getLineNumber(), inspect.getItemCode(), receiveItem.getMaterialDoc());
|
||||
//更新二维码数量
|
||||
if (CollectionUtil.isNotEmpty(qo.getQrCodes())) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue