root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:厂家质保书确认条件修改

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-06 11:10:58 +08:00
parent ee6f72d808
commit 09ab937611
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/FactorywarrantymstServiceImpl.java
View File

@@ -371,7 +371,11 @@ public class FactorywarrantymstServiceImpl implements FactorywarrantymstService
JSONObject jsonObject = itemArr.getJSONObject(i); JSONObject jsonObject = itemArr.getJSONObject(i);
String inspection_item_id = jsonObject.getString("inspection_item_id"); String inspection_item_id = jsonObject.getString("inspection_item_id");
JSONObject JsonValue =factDtlTab.query("inspection_item_id = '" + inspection_item_id + "' and inspection_id = '" + whereJson.getString("inspection_id") + "'").uniqueResult(0); JSONObject JsonValue =factDtlTab.query("inspection_item_id = '" + inspection_item_id + "' and inspection_id = '" + whereJson.getString("inspection_id") + "'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(JsonValue)) num = num + 1; if (ObjectUtil.isNotEmpty(JsonValue)) {
num = num + 1;
}else {
throw new BadRequestException("产品检验方案标准表项点:"+inspection_item_id+"没有对应厂家质保书明细");
}
} }
if (itemArr.size() != num) throw new BadRequestException("所有项点必须有值"); if (itemArr.size() != num) throw new BadRequestException("所有项点必须有值");

1
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_TEST_FACTORYWARRANTY001.wql
View File

@@ -120,6 +120,7 @@
dtl.material_uuid = 输入.material_id dtl.material_uuid = 输入.material_id
AND point.inspection_item_type = '01' AND point.inspection_item_type = '01'
AND dtl.up_limit <> "" AND dtl.up_limit <> ""
AND dtl.is_delete = '0'
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY

8
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -72,11 +72,11 @@ spring:
#数据库索引 #数据库索引
database: 2 database: 2
# Redis服务器地址 # Redis服务器地址
host: 47.96.133.178 host: 127.0.0.1
# Redis服务器连接端口 # Redis服务器连接端口
port: 6479 port: 6379
# Redis服务器连接密码（默认为空） # # Redis服务器连接密码（默认为空）
password: 942464Yy # password: 942464Yy
redisson: redisson:
config: | config: |
threads: 4 threads: 4