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

任务优先级，条码新增重量

Browse Source
This commit is contained in:
lyd
2022-11-11 15:14:04 +08:00
parent 0489f65328
commit ddf03aaa0b
7 changed files with 52 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wms/hd/nladmin-system/src/main/java/org/nl/wms/md/service/impl/MaterialLabelServiceImpl.java
View File

@@ -181,12 +181,6 @@ class MaterialLabelServiceImpl implements MaterialLabelService {
jsonObject.put("is_active", is_active);
WQLObject.getWQLObject("md_base_materialLabelMst").update(jsonObject);
}
public static void main(String[] args) {
String nowDate = DateUtil.format(new Date(), "yyMMddHHmm");
System.out.println(nowDate);
}
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject print(JSONObject jsonMst) {
@@ -205,6 +199,7 @@ class MaterialLabelServiceImpl implements MaterialLabelService {
jsonDtl.put("labeldtl_uuid", IdUtil.simpleUUID());
jsonDtl.put("label_code", label_code);
jsonDtl.put("order_seq", order_seq);
jsonDtl.put("weight", jsonMst.optString("weight"));
jsonDtl.put("remark", "");
jsonDtl.put("print_by", SecurityUtils.getCurrentUsername());
jsonDtl.put("print_time", now);

9
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
View File

@@ -8,6 +8,8 @@ import net.sf.json.JSONObject;
import org.nl.exception.BadRequestException;
import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.utils.SpringContextHolder;
import org.nl.wql.WQL;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.http.HttpStatus;
/**
@@ -24,7 +26,12 @@ public class AcsUtil {
result.put("data", new JSONObject());
return result;
}
// 加优先级 list
for (int i = 0; i < list.size(); i++) {
JSONObject object = list.getJSONObject(i);
String value = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode(object.getString("task_type")).getValue();
object.put("priority", value);
}
//ACS地址：127.0.0.1:8010
String acsUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("ACS_URL").getValue();

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
View File

@@ -54,7 +54,7 @@ public abstract class AbstractAcsTask {
AcsTaskDto taskDto = new AcsTaskDto();
taskDto.setTask_uuid(json.optString("task_uuid"));
taskDto.setTask_code(json.optString("task_code"));
taskDto.setTask_type("");
taskDto.setTask_type(task_type);
taskDto.setPriority(priority);
taskDto.setStart_device_code(json.optString("start_point_code"));
taskDto.setNext_device_code(json.optString("next_point_code"));