库存,扫码三期校验忽略

master
anthonyywj2 3 years ago
parent b850044cb5
commit 7937c7c843

@ -587,13 +587,22 @@ public class WareHouseController {
if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
return ResultVOUtils.error(500, "批次号不能为空!"); return ResultVOUtils.error(500, "批次号不能为空!");
} }
String orderId = addOrderRequest.getOrderId();
// String isCheck = systemParamConfigService.selectValueByParamKey("code_fill_check"); // String isCheck = systemParamConfigService.selectValueByParamKey("code_fill_check");
//三期校验 //三期校验
if (addOrderRequest.isCodeFillCheck()) { if (addOrderRequest.isCodeFillCheck()) {
BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
if (checkOriginCodeRes != null) if (checkOriginCodeRes != null)
return checkOriginCodeRes; if (StrUtil.isNotEmpty(orderId)) {
WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
warehouseQueryRequest.setOrderId(orderId);
List<WarehouseEntity> warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest);
WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys);
if (warehouseEntity == null) {
return checkOriginCodeRes;
}
} else
return checkOriginCodeRes;
} }
//过期提醒: //过期提醒:
@ -627,7 +636,6 @@ public class WareHouseController {
} }
} }
String orderId = addOrderRequest.getOrderId();
//预验收校验 //预验收校验
if (addOrderRequest.isPreCheck()) { if (addOrderRequest.isPreCheck()) {

@ -81,7 +81,7 @@ public class InvProductsController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/products/filter") @GetMapping("spms/inv/products/filter")
public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) { public BaseResponse filterInvProduct(FilterInvProductRequest filterInvProductRequest) {
boolean showSup = false; boolean showSup = true;
if (StrUtil.isNotEmpty(filterInvProductRequest.getUdiCode())) { if (StrUtil.isNotEmpty(filterInvProductRequest.getUdiCode())) {
filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode()));
} }

Loading…
Cancel
Save