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

代码更新

Browse Source
This commit is contained in:
18188916393
2022-07-14 12:50:46 +08:00
parent be05539301
commit f8869a6473
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/pda/service/impl/PdaServiceImpl.java
View File

@@ -21,7 +21,6 @@ import org.nl.wms.ext.pda.service.PdaService;
import org.nl.wms.md.service.MaterialService;
import org.nl.wms.md.service.dto.MaterialDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.tasks.InEmptyVehicleTask;
import org.nl.wms.sch.tasks.InTask;
import org.nl.wms.st.buss.BussConfig;

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpInvTask.java
View File

@@ -139,8 +139,7 @@ public class DumpInvTask extends AbstractAcsTask {
taskObj.put("update_time", DateUtil.now());
//任务基础表【sch_base_task】
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
taskTab.insert(taskObj);
WQLObject.getWQLObject("sch_base_task").insert(taskObj);
return taskObj.optString("task_uuid");
}

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java
View File

@@ -10,7 +10,6 @@ import org.nl.exception.BadRequestException;
import org.nl.modules.system.util.CodeUtil;
import org.nl.utils.SecurityUtils;
import org.nl.utils.SpringContextHolder;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.nl.wms.sch.service.dto.PointDto;
@@ -21,8 +20,6 @@ import org.nl.wms.st.util.StructFindUtil;
import org.nl.wql.core.bean.WQLObject;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
/**
* 入库任务生成
*/

10
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/core/service/impl/DumpinvServiceImpl.java
View File

@@ -135,8 +135,14 @@ public class DumpinvServiceImpl implements DumpinvService {
json.put("labeldtl_uuid", turnOutObj.optString("labeldtl_uuid"));
json.put("weight", turnOutObj.optString("canuse_weight"));
json.put("qty", turnOutObj.optString("canuse_qty"));
JSONArray turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0'").getResultJSONArray(0);
//假如是一层的 只能放在一层，假如是其他层的 不能放在1层
String point_codeflag = turnOutObj.getString("point_code");
point_codeflag = point_codeflag.substring(point_codeflag.length() - 2);
JSONArray turnInArr = new JSONArray();
if (StrUtil.equals("01", point_codeflag)){
turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name like '%1层%'").getResultJSONArray(0);
}
turnInArr = pointTab.query("area_type = '03' and point_status ='00' and lock_type='00' and is_active='1' and is_delete='0' and point_name not like '%1层%'").getResultJSONArray(0);
json.put("turnin_struct_uuid", turnInArr.getJSONObject(0).optString("point_uuid"));
json.put("vehicle_code", turnOutObj.optString("vehicle_code"));

1
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/util/StructFindUtil.java
View File

@@ -10,7 +10,6 @@ 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;
import java.util.HashMap;
import java.util.List;