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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhangzq
2023-12-12 10:59:53 +08:00
parent 0de57810b9 3318817a4a
commit 48adfaf13d
5 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/rest/HandNewMaterialController.java
View File

@@ -42,6 +42,13 @@ public class HandNewMaterialController {
return new ResponseEntity<>(handNewMaterialService.checkBucket(whereJson), HttpStatus.OK);
}
@PostMapping("/getIvtLevel")
@Log("获取库存等级")
@ApiOperation("获取库存等级")
public ResponseEntity<Object> checkBucket() {
return new ResponseEntity<>(handNewMaterialService.getIvtLevel(), HttpStatus.OK);
}
@PostMapping("/confirmVehicle")
@Log("确认组盘")
@ApiOperation("确认组盘")

6
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/in/service/HandNewMaterialService.java
View File

@@ -109,4 +109,10 @@ public interface HandNewMaterialService {
* @return Map
*/
Map<String, Object> insideInConfirm(JSONObject whereJson);
/**
* 获取库存等级
* @return Map<String, Object> 字典内容
*/
Map<String, Object> getIvtLevel();
}

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;
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;
@@ -275,6 +276,8 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
HashMap<String, String> vehicle = (HashMap<String, String>) jsonObject.get("vehicle");
HashMap<String, String> source_bill = (HashMap<String, String>) jsonObject.get("bill");
String ivt_level1 = MapUtil.getStr(jsonObject, "ivt_level");
if (ObjectUtil.isEmpty(vehicle)) {
throw new PdaRequestException("载具不能为空,请点击查询载具是否可用！");
}
@@ -446,6 +449,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);
}
@@ -472,6 +476,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"));
//如果是工序返工入库，修改桶品质类型为不良品
@@ -1049,6 +1054,17 @@ public class HandNewMaterialServiceImpl implements HandNewMaterialService {
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)
public void insertBucket(HashMap row) {
WQLObject bucket_wql = WQLObject.getWQLObject("MD_PB_BucketRecord");

12
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/wql/QST_IVT_RAWASSISTISTOR.wql
View File

@@ -490,6 +490,18 @@
ENDQUERY
ENDIF
IF 输入.flag = "14"
QUERY
SELECT
*
FROM
sys_dict_detail
WHERE
name = 'ST_IVT_LEVEL'
ENDSELECT
ENDQUERY
ENDIF