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

rev:修改newcode

Browse Source
This commit is contained in:
zhangzq
2023-12-07 14:53:55 +08:00
parent ff0f5e0269
commit d61db365fd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/util/CodeUtil.java
View File

@@ -13,13 +13,15 @@ public class CodeUtil {
HashMap<String,String> map = new HashMap<>(); HashMap<String,String> map = new HashMap<>();
map.put("flag",flag); map.put("flag",flag);
map.put("code",ruleCode); map.put("code",ruleCode);
if ("TASK_CODE".equals(ruleCode)){
GenCodeServiceImpl service = SpringContextHolder.getBean(GenCodeServiceImpl.class); GenCodeServiceImpl service = SpringContextHolder.getBean(GenCodeServiceImpl.class);
return service.taskCode(map); return service.taskCode(map);
}else { // if ("TASK_CODE".equals(ruleCode)){
GenCodeService service=new GenCodeServiceImpl(); // GenCodeServiceImpl service = SpringContextHolder.getBean(GenCodeServiceImpl.class);
return service.codeDemo(map); // return service.taskCode(map);
} // }else {
// GenCodeService service=new GenCodeServiceImpl();
// return service.codeDemo(map);
// }
} }
public static String getNewCode2(String ruleCode){ public static String getNewCode2(String ruleCode){

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -750,7 +750,6 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
public Map<String, Object> backStore(Map<String, String> jsonObject) { public Map<String, Object> backStore(Map<String, String> jsonObject) {
String point_code = jsonObject.get("point_code"); String point_code = jsonObject.get("point_code");
String storagevehicle_code = jsonObject.get("storagevehicle_code"); String storagevehicle_code = jsonObject.get("storagevehicle_code");
JSONObject vehiclejo = WQLObject.getWQLObject("md_pb_storagevehicleinfo").query("storagevehicle_code='" + storagevehicle_code + "' and is_delete='0' and is_used='1'").uniqueResult(0);
if (StrUtil.isEmpty(point_code)) { if (StrUtil.isEmpty(point_code)) {
throw new PdaRequestException("请选择一个点位"); throw new PdaRequestException("请选择一个点位");
} }
@@ -821,7 +820,6 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
//生成移库单(调用pc的移库单据) //生成移库单(调用pc的移库单据)
int seq_no = 1; int seq_no = 1;
String task_id = IdUtil.getSnowflake(1, 1).nextId() + "";
//根据其中一种物料寻找一个合适的仓位 //根据其中一种物料寻找一个合适的仓位
MaterialbaseDto materialbaseDto = materialbaseService.findById(Long.valueOf(bucketrows.getJSONObject(0).getString("material_id"))); MaterialbaseDto materialbaseDto = materialbaseService.findById(Long.valueOf(bucketrows.getJSONObject(0).getString("material_id")));
Long material_type_id = materialbaseDto.getMaterial_type_id(); Long material_type_id = materialbaseDto.getMaterial_type_id();