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-16 14:41:04 +08:00
parent 9194ec2d94 534a2af695
commit 0e08927c3a
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java
View File

@ -1180,38 +1180,18 @@ public class IncomingInspectionTaskControllerService {
updateWrapper.update(); updateWrapper.update();
long testingMethodId = dictionaryItemService.getIdByCode("InspectionStandardTestingMethod", "Full"); if (task.getUnqualifiedQty() > 0) {
if (Objects.equals(task.getTestingMethodDictItemId(), testingMethodId)) { issueTicketControllerService.initiate(task.getId());
//全检 }
if (TransactionSynchronizationManager.isSynchronizationActive()) { if (TransactionSynchronizationManager.isSynchronizationActive()) {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override @Override
public void afterCommit() { public void afterCommit() {
wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0);
}
});
} else {
wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0);
}
if (task.getUnqualifiedQty() > 0) {
issueTicketControllerService.initiate(task.getId());
}
} else {
//抽样
if (request.getQualified()) {
if (TransactionSynchronizationManager.isSynchronizationActive()) {
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
@Override
public void afterCommit() {
wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0);
}
});
} else {
wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0); wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0);
} }
} else { });
issueTicketControllerService.initiate(task.getId()); } else {
} wmsIncomingInspectionTaskCallbackService.processAsync(task.getId(), (short) 0);
} }
} }

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java
View File

@ -474,7 +474,6 @@ public class InProduceOrderController extends BaseController {
List<WmsInProduceOrderItem> items = produceOrderItemService.lambdaQuery() List<WmsInProduceOrderItem> items = produceOrderItemService.lambdaQuery()
.eq(WmsInProduceOrderItem::getOrderId, order.getId()) .eq(WmsInProduceOrderItem::getOrderId, order.getId())
.list(); .list();
items.removeIf(item -> Objects.equals(0, item.getInspectionStatus()) || Objects.equals(item.getInspectionStatus(), 2));
return ApiResult.success( return ApiResult.success(
items.stream() items.stream()
.map(item -> new NoScanItemVO() .map(item -> new NoScanItemVO()