From 022c1483e1cb87b22742b247f25f8152a010bf2f Mon Sep 17 00:00:00 2001 From: LSH Date: 星期一, 24 七月 2023 19:49:06 +0800 Subject: [PATCH] #入库找库位基础逻辑完成,接口第一次测试完成,测试结果:"OK" --- src/main/java/com/zy/common/service/CommonService.java | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 98c7487..c71f0c0 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -132,23 +132,9 @@ break; } } - String val = String.valueOf(vo.getValue()); - if (Cools.isEmpty(batch)) { - batch = val; - } else { - int year0 = Integer.parseInt(batch.substring(0, 2)); - int month0 = Integer.parseInt(batch.substring(2, 4)); - int year = Integer.parseInt(val.substring(0, 2)); - int month = Integer.parseInt(val.substring(2, 4)); - if (year <= year0) { - if (month < month0) { - batch = val; - } - } - } } if (sameMatnr) { - List<String> locNos = locDetlService.getSameDetlToday2(matnr, batch, sRow, eRow); + List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow); for (String locNo : locNos) { if (Utils.isShallowLoc(slaveProperties, locNo)) { continue; @@ -291,6 +277,9 @@ locTypeDto.setLocType1((short) 2); return getLocNo(1, staDescId, sourceStaNo, list, locTypeDto, times); } + if (!sign){ + throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�"); + } log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); throw new CoolException("娌℃湁绌哄簱浣�"); } -- Gitblit v1.9.1