diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java index 15c2aeb6..ae50d5e5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.pda.st.in.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; @@ -273,6 +274,8 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { HashMap vehicle = (HashMap) jsonObject.get("vehicle"); HashMap source_bill = (HashMap) jsonObject.get("bill"); + String ivt_level1 = MapUtil.getStr(jsonObject, "ivt_level"); + if (ObjectUtil.isEmpty(vehicle)) { throw new PdaRequestException("载具不能为空,请点击查询载具是否可用!"); } @@ -435,6 +438,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { row.put("create_id", currentUserId + ""); row.put("create_name", nickName); row.put("create_time", now); + row.put("ivt_level", ivt_level1); row.put("flag", flag); this.insertBucket(row); } @@ -463,6 +467,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { bucket_map.put("makeup_optid", currentUserId + ""); bucket_map.put("makeup_optname", nickName); bucket_map.put("makeup_time", now); + bucket_map.put("ivt_level", ivt_level1); bucket_map.put("storagevehicle_id", vehicle.get("storagevehicle_id")); bucket_map.put("storagevehicle_code", vehicle.get("storagevehicle_code")); //如果是工序返工入库,修改桶品质类型为不良品 @@ -1040,6 +1045,17 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService { return returnjo; } + @Override + public Map getIvtLevel() { + JSONArray resultArr = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParam("flag", "14").process().getResultJSONArray(0); + + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功!"); + returnjo.put("ivtLevel", resultArr); + return returnjo; + } + @Transactional(rollbackFor = Exception.class) public void insertBucket(HashMap row) { WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");