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

rev：等级修改

Browse Source
This commit is contained in:
liuxy
2023-12-12 08:57:59 +08:00
parent 2bb22a03fa
commit 35790c46a6
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/impl/HandNewMaterialServiceImpl.java
View File

@@ -1,6 +1,7 @@
package org.nl.pda.st.in.service.impl; package org.nl.pda.st.in.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@@ -273,6 +274,8 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
HashMap<String, String> vehicle = (HashMap<String, String>) jsonObject.get("vehicle"); HashMap<String, String> vehicle = (HashMap<String, String>) jsonObject.get("vehicle");
HashMap<String, String> source_bill = (HashMap<String, String>) jsonObject.get("bill"); HashMap<String, String> source_bill = (HashMap<String, String>) jsonObject.get("bill");
String ivt_level1 = MapUtil.getStr(jsonObject, "ivt_level");
if (ObjectUtil.isEmpty(vehicle)) { if (ObjectUtil.isEmpty(vehicle)) {
throw new PdaRequestException("载具不能为空,请点击查询载具是否可用！"); throw new PdaRequestException("载具不能为空,请点击查询载具是否可用！");
} }
@@ -435,6 +438,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
row.put("create_id", currentUserId + ""); row.put("create_id", currentUserId + "");
row.put("create_name", nickName); row.put("create_name", nickName);
row.put("create_time", now); row.put("create_time", now);
row.put("ivt_level", ivt_level1);
row.put("flag", flag); row.put("flag", flag);
this.insertBucket(row); this.insertBucket(row);
} }
@@ -463,6 +467,7 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
bucket_map.put("makeup_optid", currentUserId + ""); bucket_map.put("makeup_optid", currentUserId + "");
bucket_map.put("makeup_optname", nickName); bucket_map.put("makeup_optname", nickName);
bucket_map.put("makeup_time", now); 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_id", vehicle.get("storagevehicle_id"));
bucket_map.put("storagevehicle_code", vehicle.get("storagevehicle_code")); bucket_map.put("storagevehicle_code", vehicle.get("storagevehicle_code"));
//如果是工序返工入库，修改桶品质类型为不良品 //如果是工序返工入库，修改桶品质类型为不良品
@@ -1040,6 +1045,17 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
return returnjo; return returnjo;
} }
@Override
public Map<String, Object> 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) @Transactional(rollbackFor = Exception.class)
public void insertBucket(HashMap row) { public void insertBucket(HashMap row) {
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord"); WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");