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

Merge remote-tracking branch 'origin/feature/NoScanning' into feature/NoScanning

This commit is contained in:
yf001217 2026-06-10 20:09:52 +08:00
parent 6acfc1f24d 6c81dfdf93
commit 53aebeaf46
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/WmsIncomingInspectionTaskCallbackService.java
View File

@ -151,7 +151,7 @@ public class WmsIncomingInspectionTaskCallbackService {
boolean callbackResult = true; boolean callbackResult = true;
try { try {
wmsApiService.post(inventoryUrl, qo, "库存检验任务回调WMS"); // wmsApiService.post(inventoryUrl, qo, "库存检验任务回调WMS");
inventoryService.lambdaUpdate() inventoryService.lambdaUpdate()
.set(WmsInventory::getDetectionStatus, (short) 2) .set(WmsInventory::getDetectionStatus, (short) 2)
.set(WmsInventory::getDetectionResults, taskVO.getInspectionResult()) .set(WmsInventory::getDetectionResults, taskVO.getInspectionResult())

5
nflg-qms-admin/src/test/java/com/nflg/qms/admin/QmsQcMaterialApiTest.java
View File

@ -143,13 +143,11 @@ public class QmsQcMaterialApiTest {
QmsQcMaterialAddQO request = buildValidAddRequest(); QmsQcMaterialAddQO request = buildValidAddRequest();
request.setMaterialNo("TEST_FULL_" + System.currentTimeMillis()); request.setMaterialNo("TEST_FULL_" + System.currentTimeMillis());
request.setMaterialDesc("完整参数测试物料"); request.setMaterialDesc("完整参数测试物料");
request.setMaterialDescIsUpgrade(true);
request.setDrawingNo("DWG-TEST-001"); request.setDrawingNo("DWG-TEST-001");
request.setDrawingNoVer("V1.0"); request.setDrawingNoVer("V1.0");
request.setMaterialName("测试物料名称"); request.setMaterialName("测试物料名称");
request.setMaterialTexture("钢材"); request.setMaterialTexture("钢材");
request.setMaterialSpecifications("100x50x10"); request.setMaterialSpecifications("100x50x10");
request.setIsStandardMaintained(false);
ApiResult<Void> result = post("/qcMaterial/add", request, new TypeReference<>() {}); ApiResult<Void> result = post("/qcMaterial/add", request, new TypeReference<>() {});
assertSuccess(result, "完整参数新增失败"); assertSuccess(result, "完整参数新增失败");
@ -234,7 +232,6 @@ public class QmsQcMaterialApiTest {
// 先新增一个物料用于删除 // 先新增一个物料用于删除
QmsQcMaterialAddQO addRequest = buildValidAddRequest(); QmsQcMaterialAddQO addRequest = buildValidAddRequest();
addRequest.setMaterialNo("TEST_DELETE_" + System.currentTimeMillis()); addRequest.setMaterialNo("TEST_DELETE_" + System.currentTimeMillis());
addRequest.setIsStandardMaintained(false);
post("/qcMaterial/add", addRequest, new TypeReference<>() {}); post("/qcMaterial/add", addRequest, new TypeReference<>() {});
// 搜索获取新增的物料ID // 搜索获取新增的物料ID
@ -261,7 +258,6 @@ public class QmsQcMaterialApiTest {
// 先新增一个规则已维护的物料 // 先新增一个规则已维护的物料
QmsQcMaterialAddQO addRequest = buildValidAddRequest(); QmsQcMaterialAddQO addRequest = buildValidAddRequest();
addRequest.setMaterialNo("TEST_DELETE_MAINTAINED_" + System.currentTimeMillis()); addRequest.setMaterialNo("TEST_DELETE_MAINTAINED_" + System.currentTimeMillis());
addRequest.setIsStandardMaintained(true);
post("/qcMaterial/add", addRequest, new TypeReference<>() {}); post("/qcMaterial/add", addRequest, new TypeReference<>() {});
// 搜索获取新增的物料ID // 搜索获取新增的物料ID
@ -372,7 +368,6 @@ public class QmsQcMaterialApiTest {
request.setMaterialName("测试物料"); request.setMaterialName("测试物料");
request.setDrawingNo("DWG-" + System.currentTimeMillis()); request.setDrawingNo("DWG-" + System.currentTimeMillis());
request.setDrawingNoVer("V1.0"); request.setDrawingNoVer("V1.0");
request.setIsStandardMaintained(false);
return request; return request;
} }
} }

10
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PdiInspectionTaskCallbackQO.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.qo; package com.nflg.wms.common.pojo.qo;
import jakarta.validation.constraints.NotBlank;
import lombok.Data;import lombok.experimental.Accessors; import lombok.Data;import lombok.experimental.Accessors;
@Data @Data
@ -12,9 +13,14 @@ public class PdiInspectionTaskCallbackQO {
private String orderNo; private String orderNo;
/** /**
* 物料编号 * 机型编号
*/ */
private String materialNo; private String modelNo;
/**
* 机台编号
*/
private String deviceNo;
/** /**
* 质检是否合格 * 质检是否合格

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

@ -244,7 +244,8 @@ public class QmsController extends BaseController {
VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在"); VUtil.trueThrowBusinessError(Objects.isNull(order)).throwMessage("订单不存在");
WmsInProduceOrderItem item = produceOrderItemService.lambdaQuery() WmsInProduceOrderItem item = produceOrderItemService.lambdaQuery()
.eq(WmsInProduceOrderItem::getOrderId, order.getId()) .eq(WmsInProduceOrderItem::getOrderId, order.getId())
.eq(WmsInProduceOrderItem::getMaterialNo, qo.getMaterialNo()) .eq(WmsInProduceOrderItem::getModelNo, qo.getModelNo())
.eq(WmsInProduceOrderItem::getWorkbenchNo, qo.getDeviceNo())
.one(); .one();
item.setInspectionStatus(qo.isPass() ? 1 : 2); item.setInspectionStatus(qo.isPass() ? 1 : 2);
produceOrderItemService.updateById(item); produceOrderItemService.updateById(item);