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

add:出入库单增加明细载具物料查询;限位策略增加1109过滤1,2列

Browse Source
This commit is contained in:
zhangzq
2024-12-25 17:28:48 +08:00
parent 522e59d4b6
commit a111906292
15 changed files with 111 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/hd/.idea/encodings.xml generated
View File

@@ -3,5 +3,7 @@
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$/nladmin-system/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/nladmin-system/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>
</project>

12
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/TableDataInfo.java
View File

@@ -7,6 +7,7 @@ import lombok.Data;
import java.util.Date;
import lombok.NoArgsConstructor;
import org.nl.common.language.LangProcess;
import java.io.Serializable;
import java.util.List;
@@ -62,7 +63,7 @@ public class TableDataInfo<T> implements Serializable {
public static <T> TableDataInfo<T> build(IPage<T> page) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(String.valueOf(HttpStatus.HTTP_OK));
rspData.setMsg("查询成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
rspData.setContent(page.getRecords());
rspData.setTotalElements(page.getTotal());
return rspData;
@@ -71,7 +72,7 @@ public class TableDataInfo<T> implements Serializable {
public static TableDataInfo<Map> buildByDivForm(IPage<Map> page,String json_field) {
TableDataInfo<Map> rspData = new TableDataInfo<>();
rspData.setCode(String.valueOf(HttpStatus.HTTP_OK));
rspData.setMsg("查询成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
List<Map> records = page.getRecords();
records.forEach(a->{
Object o = a.get(json_field);
@@ -92,24 +93,23 @@ public class TableDataInfo<T> implements Serializable {
public static <T> TableDataInfo<T> build(List<T> list) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(String.valueOf(HttpStatus.HTTP_OK));
rspData.setMsg("查询成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
rspData.setContent(list);
rspData.setTotalElements(list.size());
return rspData;
}
public static <T> TableDataInfo<T> build() {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(String.valueOf(HttpStatus.HTTP_OK));
rspData.setMsg("操作成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
return rspData;
}
public static <T> TableDataInfo<T> buildJson(Object result) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(String.valueOf(HttpStatus.HTTP_OK));
rspData.setData(result);
rspData.setMsg("操作成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
return rspData;
}
}

7
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/entity/TableDataInfo.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.http.HttpStatus;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.nl.common.language.LangProcess;
import java.io.Serializable;
import java.util.List;
@@ -53,7 +54,7 @@ public class TableDataInfo<T> implements Serializable {
public static <T> TableDataInfo<T> build(IPage<T> page) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
rspData.setContent(page.getRecords());
rspData.setTotalElements(page.getTotal());
return rspData;
@@ -62,7 +63,7 @@ public class TableDataInfo<T> implements Serializable {
public static <T> TableDataInfo<T> build(List<T> list) {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
rspData.setContent(list);
rspData.setTotalElements(list.size());
return rspData;
@@ -71,7 +72,7 @@ public class TableDataInfo<T> implements Serializable {
public static <T> TableDataInfo<T> build() {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("操作成功");
rspData.setMsg(LangProcess.msg("common_ssucess"));
return rspData;
}

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.dispatch_manage.task.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
@@ -42,6 +43,7 @@ public class SchBaseTaskController {
@PostMapping("getVehicleTask")
@Log("查询载具任务")
@SaIgnore
public ResponseEntity<Object> getVehicleTask(@RequestBody JSONObject param) {
Assert.noNullElements(new Object[]{param,param.getString("vehicle_id")},"请求参数不能为空");
return new ResponseEntity<>(iSchBaseTaskService.getByVehicle(param.getString("vehicle_id")), HttpStatus.OK);
@@ -78,6 +80,7 @@ public class SchBaseTaskController {
@PutMapping("/operation")
@Log("手动更新任务状态")
@SaIgnore
public ResponseEntity<Object> update(@RequestBody JSONObject map) {
iSchBaseTaskService.operation(map);
return new ResponseEntity<>(HttpStatus.OK);

39
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -153,30 +153,27 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
}
}
} else if (param.getString("status").equals(StatusEnum.FORM_STATUS.code("下发"))) {
ArrayList<SchBaseTask> list = ListOf.of(task);
if (!CollectionUtils.isEmpty(list)) {
List<String> taskCodes = list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList());
TableDataInfo response = wmsToAcsService.interationToExt(list, "createTask");
if (!response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) {
JSONArray results = (JSONArray) JSON.toJSON(response.getData());
if (!CollectionUtils.isEmpty(results)) {
for (Object result : results) {
Map resultM = (Map) result;
taskCodes.remove(resultM.get("task_code"));
this.update(new UpdateWrapper<SchBaseTask>()
.eq("task_code", resultM.get("task_code"))
.set("status", StatusEnum.FORM_STATUS.code("暂停"))
.set("update_time", DateUtil.now()).set("remark", resultM.get("msg")));
}
}
}
if (!CollectionUtils.isEmpty(taskCodes)) {
JSONObject object = new JSONObject();
object.put("vehicle_code",task.getVehicle_code());
object.put("task_type","1");
object.put("priority","1");
object.put("start_point_code",task.getPoint_code1());
object.put("next_point_code",task.getPoint_code2());
object.put("agv_action_type","1");
object.put("priority","1");
object.put("task_code",task.getTask_code());
TableDataInfo tableDataInfo = InterationUtil.notifyExt("/api/task", object);
if (!tableDataInfo.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))) {
this.update(new UpdateWrapper<SchBaseTask>()
.set("status", StatusEnum.FORM_STATUS.code("下发"))
.in("task_code", taskCodes));
.eq("task_code", task.getTask_code())
.set("status", StatusEnum.FORM_STATUS.code("暂停"))
.set("update_time", DateUtil.now()).set("remark", "下发失败"));
}
this.update(new UpdateWrapper<SchBaseTask>()
.set("status", StatusEnum.FORM_STATUS.code("下发"))
.in("task_code", task.getTask_code()));
}
} else {
else {
this.update(new UpdateWrapper<SchBaseTask>()
.set("status", param.getString("status"))
.eq("task_code", task_code));

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
View File

@@ -20,6 +20,7 @@ import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
import org.nl.wms.external_system.GateWayService;
import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
@@ -69,6 +70,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
@Autowired
private IStIvtStructattrService iStIvtStructattrService;
@Override
public Object queryAll(GroupDickQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -168,6 +170,8 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
}
this.saveBatch(map.values());
iMdPbVehicleMaterService.saveBatch(vehicleMaters);
}
@Override

14
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/group/GroupController.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.pda_manage.group;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,11 +10,14 @@ import org.apache.commons.lang3.StringUtils;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.RedissonUtils;
import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService;
import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase;
import org.nl.wms.base_manage.material.service.dto.MaterialQuery;
import org.nl.wms.early_manage.service.early_inv.dao.AlmEarlyInv;
import org.nl.wms.external_system.GateWayService;
import org.nl.wms.external_system.dto.InteracteDto;
import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
import org.nl.wms.pda_manage.group.dto.GroupItemData;
import org.nl.wms.pda_manage.group.dto.MaterGroupDto;
@@ -46,6 +50,8 @@ public class GroupController {
private IMdGruopDickService iMdGruopDickService;
@Autowired
private IMdMeMaterialbaseService iMdMeMaterialbaseService;
@Autowired
private GateWayService gateWayService;
@PostMapping("storCode")
@SaIgnore
@@ -110,6 +116,14 @@ public class GroupController {
item.setUnit_id("16");
}
iMdGruopDickService.groupDick((JSONObject) JSONObject.toJSON(form));
//应付工作
InteracteDto apply = InteracteDto.builder()
.service("InStorage")
.ip("127.0.0.1")
.type("groupInStorage")
.request_time(DateUtil.now())
.trace_id("12312sd").data(MapOf.of(form.getItem().get(0).getVehicle_code(), "1109")).build();
gateWayService.apply(apply);
},"手持组盘入库",5);
return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
}

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/controller/StIvtStructattrController.java
View File

@@ -3,15 +3,19 @@ package org.nl.wms.stor_manage.struct.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.ListOf;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.sect.service.IStIvtSectattrService;
import org.nl.wms.base_manage.sect.service.dao.StIvtSectattr;
import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService;
import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr;
import org.nl.wms.stor_manage.struct.service.dto.StructattrQuery;
@@ -42,6 +46,8 @@ public class StIvtStructattrController {
private IStIvtStructattrService structattrService;
@Autowired
private ColumnInfoService columnInfoService;
@Autowired
private IStIvtSectattrService iStIvtSectattrService;
@GetMapping
@Log("仓位查询")
@@ -57,6 +63,16 @@ public class StIvtStructattrController {
dto.setCreate_id(SecurityUtils.getCurrentUserId());
dto.setCreate_name(SecurityUtils.getCurrentNickName());
dto.setCreate_time(DateUtil.now());
String sect_code = dto.getSect_code();
StIvtSectattr sect = iStIvtSectattrService.getOne(new QueryWrapper<StIvtSectattr>().eq("sect_code", sect_code));
dto.setCol_num(0);
dto.setRow_num(0);
dto.setLayer_num(0);
dto.setBlock_num(0);
if (sect == null){
throw new BadRequestException("库区信息不存在");
}
dto.setStor_code(sect.getStor_code());
structattrService.save(dto);
return new ResponseEntity<>(HttpStatus.OK);
}

47
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/task/TaskScheduleService.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpStatus;
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.RequiredArgsConstructor;
@@ -12,6 +13,7 @@ import org.nl.common.TableDataInfo;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.BaseCode;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.InterationUtil;
import org.nl.config.lucene.LuceneAppender;
import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
import org.nl.wms.dispatch_manage.task.service.dao.SchBaseTask;
@@ -65,25 +67,38 @@ public class TaskScheduleService {
if (!CollectionUtils.isEmpty(list)){
List<String> taskCodes = list.stream().map(SchBaseTask::getTask_code).collect(Collectors.toList());
log.info("---执行定时222任务:-----taskPublish-----"+ taskCodes);
TableDataInfo response = wmsToAcsService.interationToExt(list, "createTask");
if (!response.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))){
JSONArray results = (JSONArray)JSON.toJSON(response.getData());
if (!CollectionUtils.isEmpty(results)){
for (Object result : results) {
Map resultM = (Map) result;
taskCodes.remove(resultM.get("task_code"));
iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
.eq("task_code",resultM.get("task_code"))
.set("status",StatusEnum.FORM_STATUS.code("暂停"))
.set("update_time", DateUtil.now()).set("remark",resultM.get("msg")));
// TableDataInfo response = wmsToAcsService.interationToExt(list, "createTask");
for (SchBaseTask schBaseTask : list) {
JSONObject object = new JSONObject();
object.put("vehicle_code",schBaseTask.getVehicle_code());
object.put("task_type","1");
object.put("priority","1");
object.put("start_point_code",schBaseTask.getPoint_code1());
object.put("next_point_code",schBaseTask.getPoint_code2());
object.put("agv_action_type","1");
object.put("priority","1");
TableDataInfo tableDataInfo = InterationUtil.notifyExt("/api/task", object);
if (!tableDataInfo.getCode().equals(String.valueOf(HttpStatus.HTTP_OK))){
JSONArray results = (JSONArray)JSON.toJSON(tableDataInfo.getData());
if (!CollectionUtils.isEmpty(results)){
for (Object result : results) {
Map resultM = (Map) result;
taskCodes.remove(resultM.get("task_code"));
iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
.eq("task_code",schBaseTask.getTask_code())
.set("status",StatusEnum.FORM_STATUS.code("暂停"))
.set("update_time", DateUtil.now()).set("remark",resultM.get("msg")));
}
}
}
if (!CollectionUtils.isEmpty(taskCodes)){
iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
.set("status",StatusEnum.FORM_STATUS.code("下发"))
.in("task_code",schBaseTask.getTask_code()));
}
}
if (!CollectionUtils.isEmpty(taskCodes)){
iSchBaseTaskService.update(new UpdateWrapper<SchBaseTask>()
.set("status",StatusEnum.FORM_STATUS.code("下发"))
.in("task_code",taskCodes));
}
}
}
}catch (Exception ex){

2
wms_pro/hd/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -8,7 +8,7 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://${DB_HOST:192.168.8.218}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
url: jdbc:mysql://${DB_HOST:192.168.81.251}:${DB_PORT:3306}/${DB_NAME:wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
username: ${DB_USER:root}
password: ${DB_PWD:123456}

2
wms_pro/hd/nladmin-system/src/main/resources/config/application.yml
View File

@@ -6,7 +6,7 @@ spring:
main:
allow-bean-definition-overriding: true
messages:
basename: language/status/status,language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
basename: language/common/common,language/status/status,language/login/login,language/error/error,language/buss/buss,language/task/task,language/monitor/one_device/one_device,language/monitor/two_device/two_device,language/monitor/universal/universal
freemarker:
check-template-location: false
profiles:

2
wms_pro/qd/src/i18n/langs/chinese.js
View File

@@ -62,8 +62,10 @@ import classification2 from './basedata/classification/zh'
import ivtChange from './ivtChange/zh'
import eslog from './eslog/zh'
import elpage from './elpage/zh'
import storage from './storage/struct/zh'
export default {
...storage,
...elpage,
...eslog,
...ivtChange,

2
wms_pro/qd/src/i18n/langs/english.js
View File

@@ -62,8 +62,10 @@ import classification2 from './basedata/classification/en'
import ivtChange from './ivtChange/en'
import eslog from './eslog/en'
import elpage from './elpage/en'
import storage from './storage/struct/en'
export default {
...storage,
...elpage,
...eslog,
...ivtChange,

2
wms_pro/qd/src/i18n/langs/espana.js
View File

@@ -57,9 +57,11 @@ import classification from './basedata/classification/es'
import ivtChange from './ivtChange/en'
import eslog from './eslog/es'
import elpage from './elpage/es'
import storage from './storage/struct/es'
export default {
...storage,
...elpage,
...eslog,
...ivtChange,

8
wms_pro/qd/src/views/wms/base_manage/struct/index.vue
View File

@@ -99,14 +99,14 @@
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item :label="$t('structManage.dialog.sect_name')" prop="sect_name">
<el-input v-model="form.sect_name" style="width: 200px;" />
<el-form-item :label="$t('structManage.dialog.sect_name')" prop="sect_code">
<el-input v-model="form.sect_code" style="width: 200px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('structManage.dialog.is_tempstruct')" prop="is_tempstruct">
<el-radio v-model="form.is_tempstruct" label="1">{{ $t('common.true') }}</el-radio>
<el-radio v-model="form.is_tempstruct" label="0">{{ $t('common.false') }}</el-radio>
<el-radio v-model="form.is_tempstruct" label="1">true</el-radio>
<el-radio v-model="form.is_tempstruct" label="0">false</el-radio>
</el-form-item>
</el-col>
</el-row>