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

rev：测试修改

Browse Source
This commit is contained in:
liuxy
2024-02-27 19:42:06 +08:00
parent aca9984d3f
commit 89371b1d5b
14 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInBoxTask.java
View File

@@ -65,6 +65,10 @@ public class TwoInBoxTask extends AbstractAcsTask {
WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
// 载具扩展属性表
WQLObject veExtTab = WQLObject.getWQLObject("md_pb_storagevehicleext");
// 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0);
// 更新任务的参数
JSONObject map = new JSONObject();
@@ -84,9 +88,9 @@ public class TwoInBoxTask extends AbstractAcsTask {
map.put("task_status", TaskStatusEnum.FINISHED.getCode());
// 更新仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
jsonAttr.put("storagevehicle_code",taskObj.getString("vehicle_code"));
jsonAttr.put("storagevehicle_code",jsonTask.getString("vehicle_code"));
attrTab.update(jsonAttr);
}
@@ -101,12 +105,12 @@ public class TwoInBoxTask extends AbstractAcsTask {
map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
// 解锁仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
attrTab.update(jsonAttr);
// 删除载具对应木箱记录
veExtTab.delete("pcsn = '"+taskObj.getString("vehicle_code")+"'");
veExtTab.delete("pcsn = '"+jsonTask.getString("vehicle_code")+"'");
}

13
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoInEmpTask.java
View File

@@ -64,9 +64,12 @@ public class TwoInEmpTask extends AbstractAcsTask {
@Override
@Transactional(rollbackFor = Exception.class)
public void updateTaskStatus(JSONObject taskObj, String status) {
// 仓位表
WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
// 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0);
// 更新任务的参数
JSONObject map = new JSONObject();
@@ -86,10 +89,10 @@ public class TwoInEmpTask extends AbstractAcsTask {
map.put("task_status", TaskStatusEnum.FINISHED.getCode());
// 更新仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
jsonAttr.put("storagevehicle_code",taskObj.getString("vehicle_code"));
jsonAttr.put("storagevehicle_type",taskObj.getString("vehicle_type"));
jsonAttr.put("storagevehicle_code",jsonTask.getString("vehicle_code"));
jsonAttr.put("storagevehicle_type",jsonTask.getString("vehicle_type"));
attrTab.update(jsonAttr);
}
@@ -104,7 +107,7 @@ public class TwoInEmpTask extends AbstractAcsTask {
map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
// 解锁仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code2") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
attrTab.update(jsonAttr);
}

41
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
View File

@@ -5,13 +5,19 @@ import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import org.nl.b_lms.sch.point.dao.SchBasePoint;
import org.nl.b_lms.sch.point.service.IschBasePointService;
import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService;
import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxlashboundService;
import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxinfo;
import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound;
import org.nl.b_lms.storage_manage.ios.enums.IOSEnum;
import org.nl.common.utils.SecurityUtils;
@@ -21,17 +27,22 @@ import org.nl.wms.sch.AcsTaskDto;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.manage.TaskStatusEnum;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* 二期捆扎任务类
* Created by Lxy on 2024/1/19.
*/
@Service
@RequiredArgsConstructor
public class TwoLashTask extends AbstractAcsTask {
/**
@@ -39,6 +50,8 @@ public class TwoLashTask extends AbstractAcsTask {
*/
private final String THIS_CLASS = TwoLashTask.class.getName();
private final IBstIvtBoxinfoService iBstIvtBoxinfoService;
@Override
public List<AcsTaskDto> addTask() {
/*
@@ -46,10 +59,37 @@ public class TwoLashTask extends AbstractAcsTask {
*/
JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
// 查询木箱信息
List<String> vehicle_code = arr.stream()
.map(row -> JSONObject.parseObject(JSON.toJSONString(row), JSONObject.class))
.map(row -> row.getString("vehicle_code"))
.collect(Collectors.toList());
List<BstIvtBoxinfo> boxDaoList = iBstIvtBoxinfoService.list(
new QueryWrapper<BstIvtBoxinfo>().lambda()
.in(BstIvtBoxinfo::getBox_no, vehicle_code)
);
ArrayList<AcsTaskDto> resultList = new ArrayList<>();
for (int i = 0; i < arr.size(); i++) {
JSONObject json = arr.getJSONObject(i);
List<BstIvtBoxinfo> dao = boxDaoList.stream()
.filter(row -> row.getBox_no().equals(json.getString("vehicle_code")))
.collect(Collectors.toList());
if (ObjectUtil.isEmpty(dao)) {
throw new BadRequestException("未查询到相关木箱信息!");
}
JSONObject interaction_json = new JSONObject();
interaction_json.put("isLeave",json.getString("is_auto_issue"));
interaction_json.put("length",dao.get(0).getBox_length());
interaction_json.put("weight",dao.get(0).getBox_width());
interaction_json.put("height",dao.get(0).getBox_high());
interaction_json.put("template",dao.get(0).getBox_high());
interaction_json.put("bindingTimes","1");
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
AcsTaskDto dto = AcsTaskDto.builder()
.ext_task_id(json.getString("task_id"))
@@ -62,6 +102,7 @@ public class TwoLashTask extends AbstractAcsTask {
.class_type(json.getString("task_type"))
.dtl_type(String.valueOf(dtl_type))
.remark(json.getString("remark"))
.interaction_json(interaction_json.toString())
.build();
resultList.add(dto);
}

8
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutBoxTask.java
View File

@@ -63,6 +63,10 @@ public class TwoOutBoxTask extends AbstractAcsTask {
// 仓位表
WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
// 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0);
// 更新任务的参数
JSONObject map = new JSONObject();
@@ -82,7 +86,7 @@ public class TwoOutBoxTask extends AbstractAcsTask {
map.put("task_status", TaskStatusEnum.FINISHED.getCode());
// 更新仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
jsonAttr.put("storagevehicle_code","");
attrTab.update(jsonAttr);
@@ -99,7 +103,7 @@ public class TwoOutBoxTask extends AbstractAcsTask {
map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
// 解锁仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
attrTab.update(jsonAttr);
}

8
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutEmpTask.java
View File

@@ -63,6 +63,10 @@ public class TwoOutEmpTask extends AbstractAcsTask {
// 仓位表
WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr");
// 任务表
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
JSONObject jsonTask = taskTab.query("task_id = '" + taskObj.getString("task_id") + "'").uniqueResult(0);
// 更新任务的参数
JSONObject map = new JSONObject();
@@ -82,7 +86,7 @@ public class TwoOutEmpTask extends AbstractAcsTask {
map.put("task_status", TaskStatusEnum.FINISHED.getCode());
// 更新仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
jsonAttr.put("storagevehicle_code","");
jsonAttr.put("storagevehicle_type","");
@@ -100,7 +104,7 @@ public class TwoOutEmpTask extends AbstractAcsTask {
map.put("is_delete", IOSEnum.IS_NOTANDYES.code("是"));
// 解锁仓位
JSONObject jsonAttr = attrTab.query("struct_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0);
JSONObject jsonAttr = attrTab.query("struct_code = '" + jsonTask.getString("point_code1") + "'").uniqueResult(0);
jsonAttr.put("lock_type",IOSEnum.LOCK_TYPE.code("未锁定"));
attrTab.update(jsonAttr);
}

2
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutExceptionalTask.java
View File

@@ -95,7 +95,7 @@ public class TwoOutExceptionalTask extends AbstractAcsTask {
JSONObject jsonPoint = pointTab.query("region_id = '" + RegionTypeEnum.TWO_OUT01.getId() + "' and is_delete = '0' and is_used = '1'").uniqueResult(0);
JSONObject jsonTaskParam = new JSONObject();
jsonTaskParam.put("task_type", "010504");
jsonTaskParam.put("task_type", "010711");
jsonTaskParam.put("point_code1", jsonTask.getString("point_code2"));
jsonTaskParam.put("point_code2", jsonPoint.getString("point_code"));
jsonTaskParam.put("vehicle_code", jsonTask.getString("vehicle_code"));

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java
View File

@@ -72,7 +72,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
/*
* 找一个木箱区的一个仓位,生成任务并下发
*/
// 判断起点点位是否存在
/* // 判断起点点位是否存在
JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" +
IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" +
IOSEnum.IS_NOTANDYES.code("是") + "'")
@@ -80,7 +80,7 @@ public class InBoxManageServiceImpl implements InBoxManageService {
if (ObjectUtil.isEmpty(jsonPoint)) {
throw new BadRequestException("起始点位不存在或未启用!");
}
}*/
// 找一个木箱区空位
JSONObject jsonParam = new JSONObject();

14
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
View File

@@ -61,6 +61,11 @@ public class LashManageServiceImpl implements LashManageService {
*/
private final IBstIvtBoxlashboundService iBstIvtBoxlashboundService;
/**
* 捆扎任务创建
*/
private final TwoLashTask twoLashTask;
@Override
@Transactional
public void createLashTask(JSONObject whereJson) {
@@ -186,9 +191,8 @@ public class LashManageServiceImpl implements LashManageService {
jsonTaskParam.put("vehicle_code", whereJson.getString("vehicle_code"));
jsonTaskParam.put("is_auto_issue", is_move);
TwoLashTask taskBean = new TwoLashTask();
taskBean.createTask(jsonTaskParam);
taskBean.immediateNotifyAcs(null);
twoLashTask.createTask(jsonTaskParam);
twoLashTask.immediateNotifyAcs(null);
}
@Override
@@ -216,7 +220,7 @@ public class LashManageServiceImpl implements LashManageService {
result.put("weight", boxDao.getBox_width());
result.put("height", boxDao.getBox_high());
result.put("isBinding", IOSEnum.IS_SEND.code("是"));
result.put("isLabeling", IOSEnum.IS_SEND.code("是"));
result.put("isLabeling", IOSEnum.IS_SEND.code("否"));
result.put("labelingTemplate", boxDao.getLash_num());
result.put("bindingTemplate", "1");
@@ -224,7 +228,7 @@ public class LashManageServiceImpl implements LashManageService {
result.put("printDevice", "1");
result.put("printQty", "1");
result.put("bundleTimes", "1");
result.put("bundleTimes", "2");
return result;
}

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBoxManageServiceImpl.java
View File

@@ -55,7 +55,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
whereJson.put("stor_id", IOSEnum.STOR_ID.code("二期"));
whereJson.put("sect_id", RegionTypeEnum.TWO_MX01.getId());
// 判断起点点位是否存在
/* // 判断起点点位是否存在
JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" +
IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" +
IOSEnum.IS_NOTANDYES.code("是") + "'")
@@ -63,7 +63,7 @@ public class OutBoxManageServiceImpl implements OutBoxManageService {
if (ObjectUtil.isEmpty(jsonPoint)) {
throw new BadRequestException("终点点位不存在或未启用!");
}
}*/
JSONObject jsonAttr = getStruct(whereJson);

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutVehicleManageServiceImpl.java
View File

@@ -58,7 +58,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
whereJson.put("sect_id", RegionTypeEnum.TWO_TTP01.getId());
whereJson.put("storagevehicle_type", whereJson.getString("vehicle_type"));
// 判断起点点位是否存在
/* // 判断起点点位是否存在
JSONObject jsonPoint = pointTab.query("point_code = '" + whereJson.getString("device_code") + "' AND is_delete = '" +
IOSEnum.IS_NOTANDYES.code("否") + "' AND is_used = '" +
IOSEnum.IS_NOTANDYES.code("是") + "'")
@@ -66,7 +66,7 @@ public class OutVehicleManageServiceImpl implements OutVehicleManageService {
if (ObjectUtil.isEmpty(jsonPoint)) {
throw new BadRequestException("终点点位不存在或未启用!");
}
}*/
JSONObject jsonAttr = getStruct(whereJson);

20
lms/nladmin-system/src/main/java/org/nl/start/Init.java
View File

@@ -159,21 +159,21 @@ public class Init implements ApplicationRunner {
json.put("struct_id", IdUtil.getSnowflake(1,1).nextId());
if (i < 10) {
json.put("struct_code", "81-"+"000"+i+"-01");
json.put("struct_name", "81排"+"000"+i+"列-01层");
json.put("struct_code", "91-"+"000"+i+"-01");
json.put("struct_name", "91排"+"000"+i+"列-01层");
}else if (i >= 10 && i < 100) {
json.put("struct_code", "81-"+"00"+i+"-01");
json.put("struct_name", "81排"+"00"+i+"列-01层");
json.put("struct_code", "91-"+"00"+i+"-01");
json.put("struct_name", "91排"+"00"+i+"列-01层");
}else if (i >= 100 && i < 1000) {
json.put("struct_code", "81-"+"0"+i+"-01");
json.put("struct_name", "81排"+"0"+i+"列-01层");
json.put("struct_code", "91-"+"0"+i+"-01");
json.put("struct_name", "91排"+"0"+i+"列-01层");
} else {
json.put("struct_code", "81-"+i+"-01");
json.put("struct_name", "81排"+i+"列-01层");
json.put("struct_code", "91-"+i+"-01");
json.put("struct_name", "91排"+i+"列-01层");
}
JSONObject jsonObject = tab2.query("stor_id = '1597073830499717137'").uniqueResult(0);
JSONObject jsonObjec2 = tab3.query("stor_id = '1597073830499717137' and sect_code = 'XN81'").uniqueResult(0);
JSONObject jsonObject = tab2.query("stor_id = '1597073830499717138'").uniqueResult(0);
JSONObject jsonObjec2 = tab3.query("stor_id = '1597073830499717138' and sect_code = 'XN91'").uniqueResult(0);
// 新增仓位
json.put("simple_name", json.getString("struct_name"));

9
lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsTaskDto.java
View File

@@ -1,5 +1,6 @@
package org.nl.wms.sch;
import com.alibaba.fastjson.JSONObject;
import lombok.Builder;
import lombok.Data;
@@ -103,4 +104,12 @@ public class AcsTaskDto {
* 气涨轴尺寸
*/
private String size;
/**
* 任务扩展字段
*/
private String interaction_json;
}

1
lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue
View File

@@ -359,6 +359,7 @@ export default {
this.form.tableMater.splice(i, 1, this.form.tableMater[i]) // 通过splice 替换数据 触发视图更新
}
this.form.stor_id = this.stor_id
this.form.is_send = ''
crudRawAssist.divStruct(this.form).then(res => {
crudRawAssist.getIODtl({ 'bill_code': this.form.dtl_row.bill_code, 'open_flag': '1' }).then(res => {
this.openParam = res

6
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -363,7 +363,11 @@ export default {
this.sects = res.content
})
const area_type = '1585167595403874304'
var area_type = '1585167595403874304'
if (this.storId.toString() === '1582991156504039455') {
area_type = '1760141408548818944'
}
crudPoint.getPoint({ 'area_type': area_type }).then(res => {
this.pointList = res
})