diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index e836fd3..8a3cdab 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -243,7 +243,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial // allDevice.remove(deviceByCode); log.info("设备删除成功!"); - if (deviceByCode != null) { + if (deviceByCode != null && deviceByCode.getDeviceDriverDefination() != null) { if (StrUtil.equals("storage", deviceByCode.getDeviceDriverDefination().getFitDeviceTypes().get(0).name())) { storageTab.delete("substring_index( storage_code,'-',1)= '" + device_code + "'"); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java index 95e2b74..d82eff0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/system/rest/UserController.java @@ -25,6 +25,7 @@ import lombok.RequiredArgsConstructor; import org.nl.modules.common.config.RsaProperties; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.PageUtil; +import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.common.utils.RsaUtils; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.logging.annotation.Log; @@ -67,6 +68,7 @@ public class UserController { private final DataService dataService; private final DeptService deptService; private final RoleService roleService; + private final RedisUtils redisUtils; @ApiOperation("导出用户数据") @GetMapping(value = "/download") @@ -144,6 +146,12 @@ public class UserController { if (currentLevel > optLevel) { throw new BadRequestException("角色权限不足，不能删除：" + userService.findById(id).getUsername()); } + // 删除缓存信息 + UserDto userDto = userService.findById(id); + redisUtils.del("data::user:" + userDto.getId()); + redisUtils.del("menu::user:" + userDto.getId()); + redisUtils.del("role::auth:" + userDto.getId()); + redisUtils.del("user::username:" + userDto.getUsername()); } userService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java index 475274e..99ba492 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/rest/LocalStorageController.java @@ -17,6 +17,7 @@ package org.nl.modules.tools.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; +import com.alibaba.excel.EasyExcel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -34,6 +35,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.io.File; import java.io.IOException; /** diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java index b980e1f..15c556f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java @@ -20,6 +20,8 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelReader; +import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.modules.common.config.FileProperties; @@ -146,30 +148,38 @@ public class LocalStorageServiceImpl implements LocalStorageService { @Override @Transactional(rollbackFor = Exception.class) public void importExcel(String path) { - WQLObject measureunitTab = WQLObject.getWQLObject("md_pb_measureunit"); - Long currentUserId = SecurityUtils.getCurrentUserId(); + ExcelReader excelReader = EasyExcel.read(path).build(); + List sheets = excelReader.excelExecutor().sheetList(); + + WQLObject materialTable = WQLObject.getWQLObject("md_me_materialbase"); + JSONObject material = new JSONObject(); + Long userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - List> listMap = EasyExcel.read(path).sheet().doReadSync(); - listMap.remove(0); - for (int i = 0; i < listMap.size(); i++) { - Map map = listMap.get(i); - String unit_code = String.valueOf(map.get(1)); - String unit_name = String.valueOf(map.get(2)); - JSONObject unit = new JSONObject(); - unit.put("measure_unit_id", IdUtil.getSnowflake(1, 1).nextId()); - unit.put("unit_code", unit_code); - unit.put("unit_name", unit_name); - unit.put("qty_precision", 2); - unit.put("is_used", 1); - unit.put("is_delete", 0); - unit.put("create_id", currentUserId); - unit.put("create_name", nickName); - unit.put("create_time", now); - unit.put("update_optid", currentUserId); - unit.put("update_optname", nickName); - unit.put("update_time", now); - measureunitTab.insert(unit); + + for (ReadSheet sheet : sheets) { + List> materials = EasyExcel.read(path).sheet(sheet.getSheetNo()).doReadSync(); + for (Map materialMap : materials) { + String id = materialMap.get(1); + material.put("material_id", id); + material.put("material_name", materialMap.get(2)); + material.put("base_unit", materialMap.get(3)); + material.put("pack_qty", materialMap.get(4) == null ? 0 : Double.parseDouble(materialMap.get(4))); + + material.put("is_used", '1'); + material.put("is_delete", '0'); + material.put("create_id", userId); + material.put("create_name", nickName); + material.put("create_time", now); + material.put("update_optid", userId); + material.put("update_optname", nickName); + material.put("update_time", now); + if (ObjectUtil.isNotEmpty(materialTable.query("material_id = " + id).uniqueResult(0))) { + materialTable.update(material); + } else { + materialTable.insert(material); + } + } } } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java index b8b4ac8..036b9f5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/MaterialbaseDto.java @@ -37,7 +37,7 @@ public class MaterialbaseDto implements Serializable { private String english_name; - private long base_unit_id; + private String base_unit; private long assist_unit_id; private String base_unit_name; @@ -62,9 +62,9 @@ public class MaterialbaseDto implements Serializable { /** * 计量单位 */ - private Long weight_unit_id; + private Long weight_unit; - private BigDecimal gross_weight; + private BigDecimal weight; private BigDecimal net_weight; @@ -101,5 +101,5 @@ public class MaterialbaseDto implements Serializable { private Long product_series; - private Integer standing_time; + private BigDecimal pack_qty; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDto.java index c8fe954..8816dd7 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/dto/VehicleDto.java @@ -72,4 +72,7 @@ public class VehicleDto implements Serializable { /** 修改时间 */ private String update_time; + + // 载具状态 + private String vehicle_status; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java index 8b69b3f..33ab220 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/MaterialbaseServiceImpl.java @@ -111,10 +111,7 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { public MaterialbaseDto findById(Long material_id) { WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); JSONObject json = wo.query("material_id =" + material_id + "").uniqueResult(0); - String unit_name = WQLObject.getWQLObject("md_pb_measureunit").query("measure_unit_id= '" + json.getString("base_unit_id") + "'").uniqueResult(0).getString("unit_name"); - json.put("base_unit_name", unit_name); - final MaterialbaseDto obj = json.toJavaObject(MaterialbaseDto.class); - return obj; + return json.toJavaObject(MaterialbaseDto.class); } @Override @@ -138,7 +135,8 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); - dto.setMaterial_id(IdUtil.getSnowflake(1, 1).nextId()); + dto.setMaterial_id(IdUtil.getSnowflake(1L, 1L).nextId()); + dto.setIs_used("1"); dto.setCreate_id(currentUserId); dto.setCreate_name(nickName); dto.setUpdate_optid(currentUserId); @@ -173,19 +171,17 @@ public class MaterialbaseServiceImpl implements MaterialbaseService { @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("md_me_materialbase"); - for (Long material_id : ids) { - JSONObject param = new JSONObject(); - param.put("material_id", String.valueOf(material_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); + WQLObject VMTable = WQLObject.getWQLObject("st_ivt_vehicle_material"); + WQLObject vehicleTable = WQLObject.getWQLObject("md_pb_vehicle"); + WQLObject materialTable = WQLObject.getWQLObject("md_me_materialbase"); + for (Long materialId : ids) { + JSONObject vm = VMTable.query("material_id = " + materialId).uniqueResult(0); + if (ObjectUtil.isNotEmpty(vm)) { + throw new BadRequestException("载具号" + + vehicleTable.query("vehicle_id = " + vm.getString("vehicle_id")).uniqueResult(0).getString("vehicle_code") + + "存放了" + materialTable.query("material_id = " + materialId).uniqueResult(0).getString("material_name")); + } + materialTable.delete("material_id = " + materialId); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java index 8fdd0c7..776e0af 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/service/impl/VehicleServiceImpl.java @@ -11,6 +11,7 @@ import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.wms.basedata.service.VehicleService; import org.nl.wms.basedata.service.dto.VehicleDto; +import org.nl.wms.util.CommonUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,12 +44,10 @@ public class VehicleServiceImpl implements VehicleService { @Override public Map queryAll(Map whereJson, Pageable page){ - String vehicle_code = MapUtil.getStr(whereJson, "vehicle_code"); - JSONObject map = new JSONObject(); map.put("flag", "1"); - map.put("vehicle_type", MapUtil.getStr(whereJson, "vehicle_type")); - if (ObjectUtil.isNotEmpty(vehicle_code)) map.put("vehicle_code","%"+vehicle_code+"%"); + map.put("vehicle_status", MapUtil.getStr(whereJson, "vehicle_status")); + map.put("vehicle_code", MapUtil.getStr(whereJson, "vehicle_code")); JSONObject json = WQL.getWO("QMD_PB_VEHICLE").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "create_time DESC"); return json; @@ -84,45 +83,16 @@ public class VehicleServiceImpl implements VehicleService { @Override @Transactional(rollbackFor = Exception.class) - public JSONArray create(JSONObject WhereJson) { + public JSONArray create(JSONObject param) { + JSONObject vehicle = new JSONObject(); + vehicle.put("vehicle_id", IdUtil.getSnowflake(1, 1).nextId()); + vehicle.put("vehicle_code", param.getString("vehicle_code")); + vehicle.put("vehicle_status", param.getString("vehicle_status")); + CommonUtils.addCommonColum(vehicle); - WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); + WQLObject.getWQLObject("md_pb_vehicle").insert(vehicle); - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - String vehicle_type = WhereJson.getString("vehicle_type"); - String code = ""; - switch (vehicle_type) { - case "01": - code = "1m3_ttp"; - break; - case "02": - code = "1m6_ttp"; - break; - case "03": - code = "1m9_ttp"; - break; - } - - JSONArray resultCodeArr = new JSONArray(); - int num = WhereJson.getIntValue("num"); - for (int i = 0; i < num; i++) { - VehicleDto dto = new VehicleDto(); - dto.setVehicle_id(IdUtil.getSnowflake(1,1).nextId()); - dto.setVehicle_code(CodeUtil.getNewCode(code)); - dto.setVehicle_name(dto.getVehicle_code()); - dto.setVehicle_type(vehicle_type); - dto.setCreate_id(currentUserId); - dto.setCreate_name(nickName); - dto.setCreate_time(now); - - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - wo.insert(json); - resultCodeArr.add(dto.getVehicle_code()); - } - return resultCodeArr; + return new JSONArray(); } @Override @@ -131,13 +101,9 @@ public class VehicleServiceImpl implements VehicleService { VehicleDto entity = this.findById(dto.getVehicle_id()); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - - String now = DateUtil.now(); - dto.setUpdate_time(now); - dto.setUpdate_optid(currentUserId); - dto.setUpdate_optname(nickName); + dto.setUpdate_optid(SecurityUtils.getCurrentUserId()); + dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); + dto.setUpdate_time(DateUtil.now()); WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); @@ -147,19 +113,19 @@ public class VehicleServiceImpl implements VehicleService { @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentNickName(); - String now = DateUtil.now(); - - WQLObject wo = WQLObject.getWQLObject("md_pb_vehicle"); - for (Long vehicle_id: ids) { - JSONObject param = new JSONObject(); - param.put("vehicle_id", String.valueOf(vehicle_id)); - param.put("is_delete", "1"); - param.put("update_optid", currentUserId); - param.put("update_optname", nickName); - param.put("update_time", now); - wo.update(param); + WQLObject VMTable = WQLObject.getWQLObject("st_ivt_vehicle_material"); + WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); + WQLObject vehicleTable = WQLObject.getWQLObject("md_pb_vehicle"); + for (Long vehicleId: ids) { + JSONObject vm = VMTable.query("vehicle_id = " + vehicleId).uniqueResult(0); + String vehicleCode = vehicleTable.query("vehicle_id = " + vehicleId).uniqueResult(0).getString("vehicle_code"); + if (ObjectUtil.isNotEmpty(vm)) { + throw new BadRequestException("载具号" + vehicleCode + "存在组盘信息"); + } + JSONObject point = new JSONObject(); + point.put("vehicle_code", null); + pointTable.update(point, "vehicle_code = " + vehicleCode); + vehicleTable.delete("vehicle_id = " + vehicleId); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql index fb52826..7a31397 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_ME_MATERIAL.wql @@ -44,35 +44,18 @@ IF 输入.flag = "1" PAGEQUERY SELECT - mb.*, - class.class_code, - class.class_name, - unit_name, - '50' as standard_weight, - unit_name as base_unit_id_name, - class2.class_code as product_series_code, - class2.class_name as product_series_name - + mb.* FROM md_me_materialbase mb - LEFT JOIN MD_PB_ClassStandard class ON class.class_id = mb.material_type_id - LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mb.base_unit_id - left join MD_PB_ClassStandard class2 on class2.class_id =mb.product_series WHERE - mb.is_delete = '0' - and 输入.idssql + mb.is_delete = '0' + AND 输入.idssql OPTION 输入.search <> "" - ( - mb.material_code like 输入.search - OR - mb.material_name like 输入.search - ) - ENDOPTION - OPTION 输入.class_code <> "" - class.class_code like 输入.class_code - ENDOPTION - OPTION 输入.classIds <> "" - class.class_id in 输入.classIds + ( + mb.material_id like 输入.search + OR + mb.material_name like 输入.search + ) ENDOPTION ENDSELECT ENDPAGEQUERY diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE.wql index 214993c..0c353a2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/wql/QMD_PB_VEHICLE.wql @@ -14,8 +14,8 @@ ## 表字段对应输入参数 ################################################# 输入.flag TYPEAS s_string - 输入.vehicle_type TYPEAS s_string 输入.vehicle_code TYPEAS s_string + 输入.vehicle_status TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -46,16 +46,13 @@ FROM md_pb_vehicle WHERE - 1=1 - + 1 = 1 OPTION 输入.vehicle_code <> "" - vehicle_code like 输入.vehicle_code + vehicle_code LIKE CONCAT( '%', 输入.vehicle_code, '%' ) ENDOPTION - - OPTION 输入.vehicle_type <> "" - vehicle_type = 输入.vehicle_type + OPTION 输入.vehicle_status <> "" + vehicle_status = 输入.vehicle_status ENDOPTION - ENDSELECT ENDPAGEQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index cfff4c4..71ba6cb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -2,27 +2,17 @@ package org.nl.wms.ext.acs.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.nl.wms.log.LokiLog; import org.nl.wms.log.LokiLogType; import org.nl.wms.sch.manage.TaskStatusEnum; import org.nl.wms.sch.service.TaskService; -import org.nl.wms.sch.tasks.callEmpty.GjxCallEmpVehicleTask; -import org.nl.wms.sch.tasks.callEmpty.YqxCallEmpVehicleTask; -import org.nl.wms.sch.tasks.callMaterial.YqxCallMaterialTask; -import org.nl.wms.sch.tasks.sendEmpty.HtSendEmpVehicleTask; -import org.nl.wms.sch.tasks.sendEmpty.YqxSendEmpVehicleTask; -import org.nl.wms.sch.tasks.sendMaterial.GjxSendMaterialTask; -import org.nl.wms.sch.tasks.sendMaterial.HkxSendMaterialTask; -import org.nl.wms.sch.tasks.sendMaterial.YqxSendMaterialTask; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -169,129 +159,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Override @Transactional(rollbackFor = Exception.class) public JSONObject apply(JSONObject whereJson) { - String type = whereJson.getString("type"); - String point_code = whereJson.getString("point_code"); - String vehicle_type = whereJson.getString("vehicle_type"); - String vehicle_code = whereJson.getString("vehicle_code"); - //载具数量 - String vehicle_num = whereJson.getString("vehicle_num"); - //物料数量 - String material_num = whereJson.getString("material_num"); - - if (ObjectUtil.isEmpty(type)) throw new BadRequestException("类型不能为空"); - if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空"); - - /* - * 根据type判断是什么业务类型： - * 1.共挤线申请空盘 - * 2.共挤线满托入库 - * 3.油漆线申请空盘 - * 4.油漆线申请物料 - * 5.油漆线空盘入库 - * 6.一楼空盘入库 （有载具号） - * 7.油漆线->输送线(油漆线满料) - * 8.豪凯自动线下料入库 - */ - if (StrUtil.equals(type, "1")) { - // 1.共挤线申请空盘： 调用空托盘出库处理类创建任务 - if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); - - JSONObject param = new JSONObject(); - param.put("point_code2", point_code); - param.put("vehicle_type", vehicle_type); - param.put("qty", material_num); - // 创建任务 - GjxCallEmpVehicleTask taskBean = SpringContextHolder.getBean(GjxCallEmpVehicleTask.class); - taskBean.createTask(param); - - } else if (StrUtil.equals(type, "2")) { - // 2.共挤线满托入库: 调用物料入库处理类创建任务 - if (ObjectUtil.isEmpty(material_num) || (StrUtil.equals(material_num, "0"))) - throw new BadRequestException("物料数量不能为空或者为0"); - - JSONObject param = new JSONObject(); - param.put("point_code1", point_code); // 满料位 - param.put("qty", material_num); // 满料位 - param.put("vehicle_type", vehicle_type); - param.put("vehicle_code", vehicle_code); - - GjxSendMaterialTask taskBean = SpringContextHolder.getBean(GjxSendMaterialTask.class); - String task_id = taskBean.createTask(param); // 创建任务 - } else if (StrUtil.equals(type, "3")) { - // 3.油漆线申请空盘: 调用空托盘出库处理类创建任务 - if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); - - JSONObject param = new JSONObject(); - param.put("point_code2", point_code); - param.put("qty", vehicle_num); - // 创建任务 - YqxCallEmpVehicleTask taskBean = SpringContextHolder.getBean(YqxCallEmpVehicleTask.class); - String task_id = taskBean.createTask(param); - } else if (StrUtil.equals(type, "4")) { - // 4.油漆线申请物料: 调用物料出库库处理类创建任务 - JSONObject param = new JSONObject(); - param.put("point_code2", point_code); // 叫料点 - param.put("io_type", "2"); - param.put("vehicle_type", vehicle_type); - param.put("vehicle_code", vehicle_code); - param.put("material_num", material_num); - // 创建任务 - YqxCallMaterialTask taskBean = SpringContextHolder.getBean(YqxCallMaterialTask.class); - String task_id = taskBean.createTask(param); - - } else if (StrUtil.equals(type, "5")) { - // 5.油漆线空盘入库: 调用空托盘入库处理类创建任务 - if (ObjectUtil.isEmpty(point_code)) throw new BadRequestException("点位不能为空"); - if (ObjectUtil.isEmpty(vehicle_num)) throw new BadRequestException("数量不能为空"); - if (ObjectUtil.isEmpty(vehicle_type)) throw new BadRequestException("载具类型不能为空"); - - JSONObject param = new JSONObject(); - param.put("point_code1", point_code); - param.put("qty", vehicle_num); - param.put("vehicle_type", vehicle_type); - // 创建任务 - YqxSendEmpVehicleTask taskBean = SpringContextHolder.getBean(YqxSendEmpVehicleTask.class); - taskBean.createTask(param); - - - } else if (StrUtil.equals(type, "6")) { - // 6.一楼空盘入库 （有载具号）: 调用空托盘入库处理类创建任务 - if (ObjectUtil.isEmpty(vehicle_code)) throw new BadRequestException("载具号不能为空"); - JSONObject param = new JSONObject(); - - // 查询载具号对应的数量 - JSONObject jsonVeQty = new JSONObject(); - if (ObjectUtil.isEmpty(vehicle_num)) { - if (ObjectUtil.isEmpty(jsonVeQty)) throw new BadRequestException("请先手持扫码"); - } else { - jsonVeQty.put("qty", vehicle_num); - } - - param.put("qty", jsonVeQty.getString("qty")); - param.put("point_code1", point_code); - param.put("vehicle_code", vehicle_code); - param.put("vehicle_type", vehicle_type); - // 创建任务 - HtSendEmpVehicleTask taskBean = SpringContextHolder.getBean(HtSendEmpVehicleTask.class); - String task_id = taskBean.createTask(param); - - } else if (StrUtil.equals(type, "7")) { - JSONObject param = new JSONObject(); - param.put("point_code1", point_code); - param.put("qty", material_num); - // 1.生成起点确定的任务 - SpringContextHolder.getBean(YqxSendMaterialTask.class).createTask(param); - } else if (StrUtil.equals(type, "8")) { - // 8.豪凯自动线下料入库 - JSONObject param = new JSONObject(); - param.put("point_code1", point_code); - param.put("vehicle_code", vehicle_code); - param.put("vehicle_type", vehicle_type); - param.put("qty", material_num); - HkxSendMaterialTask taskBean = SpringContextHolder.getBean(HkxSendMaterialTask.class); - String task_id = taskBean.createTask(param); - - } return null; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 9c28278..7d5c153 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.sch.AcsUtil; +import org.nl.wms.sch.AcsUtils; import org.springframework.stereotype.Service; import java.util.Map; @@ -17,13 +17,13 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { @Override public Map issueTaskToAcs(JSONArray arr) { String api = "api/wms/task"; - return AcsUtil.notifyAcs(api, arr); + return AcsUtils.notifyAcs(api, arr); } @Override public Map cancelToAcs(JSONArray arr) { String api = "api/wms/cancelTask"; - return AcsUtil.notifyAcs(api, arr); + return AcsUtils.notifyAcs(api, arr); } @Override @@ -33,25 +33,25 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { //0,1,2 param.put("has_goods", ""); String api = "api/wms/updateDeviceGoods"; - return AcsUtil.notifyAcs(api, arr); + return AcsUtils.notifyAcs(api, arr); } @Override public Map order(JSONArray arr) { String api = "api/wms/order"; - return AcsUtil.notifyAcs(api, arr); + return AcsUtils.notifyAcs(api, arr); } @Override public Map orderStatusUpdate(JSONArray arr) { String api = "api/wms/orderStatusUpdate"; - return AcsUtil.notifyAcs(api, arr); + return AcsUtils.notifyAcs(api, arr); } @Override public JSONObject getPointStatus(JSONArray whereJson) { String api = "api/wms/querydevice"; - return AcsUtil.notifyAcs(api, whereJson); + return AcsUtils.notifyAcs(api, whereJson); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java deleted file mode 100644 index 7614ba1..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/auto/AutoQueryTask.java +++ /dev/null @@ -1,141 +0,0 @@ -package org.nl.wms.ext.auto; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext.acs.service.WmsToAcsService; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.PointToPointTask; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Slf4j -public class AutoQueryTask { - - private final WmsToAcsService wmsToAcsService; - - @Transactional - public void run() { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - - PointToPointTask pointTaskBean = SpringContextHolder.getBean(PointToPointTask.class); - - // 1.查找起点为油漆线 物料下料位的任务 - JSONArray taskArr = WQL.getWO("AUTO_QUERYTASK").addParam("flag", "1").process().getResultJSONArray(0); - - for (int i = 0; i < taskArr.size(); i++) { - JSONObject jsonTask = taskArr.getJSONObject(i); - /* - * 1.查找输送线有没有空位 输送线1对1关系 调用获取点位状态接口 - * 2.判断有空位的输送线是否有任务：起点和终点都要判断 - * 输送线点位：SSX01A1 - SSX01A2 ，SSX02A1 - SSX02A2 - */ - // 2.查找输送线空位，调用获取点位状态接口 - JSONArray paramArr = new JSONArray(); - - JSONObject pointA1 = new JSONObject(); - pointA1.put("device_code", "SSX01A1"); - paramArr.add(pointA1); - - JSONObject pointA2 = new JSONObject(); - pointA2.put("device_code", "SSX01A2"); - paramArr.add(pointA2); - - JSONObject pointB1 = new JSONObject(); - pointB1.put("device_code", "SSX02A1"); - paramArr.add(pointB1); - - JSONObject pointB2 = new JSONObject(); - pointB2.put("device_code", "SSX02A2"); - paramArr.add(pointB2); - - JSONObject result = wmsToAcsService.getPointStatus(paramArr); - - if (StrUtil.equals(result.getString("status"), "200")) { - JSONObject jsonPointAfter = new JSONObject(); // 处理后的json - - JSONArray dataArr = result.getJSONArray("data"); - // 3.处理返回的数据，处理后为json，key为点位编码，value为状态 - for (int j = 0; j < dataArr.size(); j++) { - JSONObject jsonObject = dataArr.getJSONObject(j); - - String device_code = jsonObject.getString("device_code"); - switch (device_code) { - case "SSX01A1" : - jsonPointAfter.put("SSX01A1",jsonObject.getString("move")); - break; - case "SSX01A2" : - jsonPointAfter.put("SSX01A2",jsonObject.getString("move")); - break; - case "SSX02A1" : - jsonPointAfter.put("SSX02A1",jsonObject.getString("move")); - break; - case "SSX02A2" : - jsonPointAfter.put("SSX02A2",jsonObject.getString("move")); - break; - } - } - JSONObject map = new JSONObject(); - // 4.1判断SSX01A1 、 SSX01A2是否是空位 无任务 - if (StrUtil.equals(jsonPointAfter.getString("SSX01A1"), "0") && StrUtil.equals(jsonPointAfter.getString("SSX01A2"), "0")) { - // 4.2如果都是空位 则判断是否有正在进行的任务 - map.put("flag", "2"); - map.put("point_code1", "('SSX01A1','SSX01A2')"); - // 查找起点是否有任务 - JSONArray is_stara = WQL.getWO("AUTO_QUERYTASK").addParamMap(map).process().getResultJSONArray(0); - // 查询终点是否有任务 - map.put("flag", "3"); - map.put("end_point_code", "('SSX01A1','SSX01A2')"); - JSONArray is_end = WQL.getWO("AUTO_QUERYTASK").addParamMap(map).process().getResultJSONArray(0); - - if (ObjectUtil.isEmpty(is_stara) && ObjectUtil.isEmpty(is_end)) { - // 4.3.更新任务终点点位 - jsonTask.put("point_code2", "SSX01A1"); - taskTab.update(jsonTask); - // 4.4.下发ACS - JSONObject jsonResultAcs = pointTaskBean.notifyAcs(jsonTask.getString("task_id")); - - if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) { - // 4.5.下发成功、更新任务状态 - jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); - taskTab.update(jsonTask); - } - // 5.1判断SSX02A1 、 SSX02A2是否是空位 无任务 - } else if (StrUtil.equals(jsonPointAfter.getString("SSX02A1"), "0") && StrUtil.equals(jsonPointAfter.getString("SSX02A2"), "0")) { - // 5.2如果都是空位 则判断是否有正在进行的任务 - map.put("flag", "2"); - map.put("point_code1", "('SSX02A1','SSX02A2')"); - // 查找起点是否有任务 - JSONArray is_stara2 = WQL.getWO("AUTO_QUERYTASK").addParamMap(map).process().getResultJSONArray(0); - // 查询终点是否有任务 - map.put("flag", "3"); - map.put("end_point_code", "('SSX02A1','SSX02A2')"); - JSONArray is_end2 = WQL.getWO("AUTO_QUERYTASK").addParamMap(map).process().getResultJSONArray(0); - - if (ObjectUtil.isEmpty(is_stara2) && ObjectUtil.isEmpty(is_end2)) { - // 5.3.更新任务终点点位 - jsonTask.put("point_code2", "SSX02A1"); - taskTab.update(jsonTask); - // 5.4.下发ACS - JSONObject jsonResultAcs = pointTaskBean.notifyAcs(jsonTask.getString("task_id")); - - if (StrUtil.equals(jsonResultAcs.getString("status"), "200")) { - // 4.5.下发成功、更新任务状态 - jsonTask.put("task_status", TaskStatusEnum.ISSUE.getCode()); - taskTab.update(jsonTask); - } - } - } - } - } - } - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java deleted file mode 100644 index 322deb7..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/rest/CallMaterialController.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.nl.wms.pda.callmaterial.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.pda.callmaterial.service.CallMaterialService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@Api(tags = "手持叫料") -@RequestMapping("api/pda/callMaterial") -@Slf4j -public class CallMaterialController { - - private final CallMaterialService callMaterialService; - - @PostMapping("/queryPoint") - @Log("查询区域点位") - @ApiOperation("查询区域点位") - public ResponseEntity queryPoint() { - return new ResponseEntity<>(callMaterialService.queryPoint(), HttpStatus.OK); - } - - @PostMapping("/confirm") - @Log("叫料确定") - @ApiOperation("叫料确定") - public ResponseEntity confirm(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(callMaterialService.confirm(whereJson), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/CallMaterialService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/CallMaterialService.java deleted file mode 100644 index e85a64b..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/CallMaterialService.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.wms.pda.callmaterial.service; - -import com.alibaba.fastjson.JSONObject; - -public interface CallMaterialService { - - /** - * 查询区域点位 - * @return json - */ - JSONObject queryPoint(); - - /** - * 叫料确定 - * @param whereJson / - * @return JSONObject - */ - JSONObject confirm(JSONObject whereJson); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/impl/CallMaterialServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/impl/CallMaterialServiceImpl.java deleted file mode 100644 index 7c1ac15..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/service/impl/CallMaterialServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.nl.wms.pda.callmaterial.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.WQL; -import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.pda.callmaterial.service.CallMaterialService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Slf4j -public class CallMaterialServiceImpl implements CallMaterialService { - private final AcsToWmsService acsToWmsService; - - @Override - public JSONObject queryPoint() { - JSONObject result = new JSONObject(); - // 1.查询区域：油漆区域 YQQY01 - JSONArray regionArr = WQL.getWO("PDA_CALLMATERIAL_01").addParam("flag", "1").process().getResultJSONArray(0); - // 2.根据区域查询对应的物料上料位 - JSONObject resultJson = new JSONObject(); - for (int i = 0; i < regionArr.size(); i++) { - JSONObject jsonRegion = regionArr.getJSONObject(i); - JSONArray pointArr = WQL.getWO("PDA_CALLMATERIAL_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); - jsonRegion.put("pointArr", pointArr); - } - resultJson.put("regionja", regionArr); - result.put("result", resultJson); - result.put("code", "1"); - result.put("desc", "查询成功"); - return result; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject confirm(JSONObject whereJson) { - JSONObject result = new JSONObject(); - // 1、准备参数：point_code、type = 4 - JSONObject param = new JSONObject(); - param.put("type", "4"); - param.put("point_code", whereJson.getString("point_code")); - // 2、调用接口 - JSONObject json = acsToWmsService.apply(param); - if (ObjectUtil.isEmpty(json) || StrUtil.equals(json.getString("status"), "200")) { - result.put("result", ""); - result.put("code", "1"); - result.put("desc", "操作成功"); - } else { - result.put("result", ""); - result.put("code", "0"); - result.put("desc", "操作失败：" + json.getString("message")); - } - return result; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/wql/PDA_CALLMATERIAL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/wql/PDA_CALLMATERIAL_01.wql deleted file mode 100644 index 41b449f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callmaterial/wql/PDA_CALLMATERIAL_01.wql +++ /dev/null @@ -1,75 +0,0 @@ -[交易说明] - 交易名： 手持叫料查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_id TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - region_id, - region_code, - region_name - FROM - sch_base_region - WHERE - region_code = 'YQQY01' - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - point_id, - point_code, - point_name - FROM - sch_base_point - WHERE - is_used = '1' - AND is_delete = '0' - AND point_type = '3' - - OPTION 输入.region_id <> "" - region_id = 输入.region_id - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java deleted file mode 100644 index 41b8b3f..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/rest/CallVehicleController.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.nl.wms.pda.callvehicle.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.pda.callvehicle.service.CallVehicleService; -import org.nl.wms.pda.sendmaterial.service.SendMaterialService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@Api(tags = "手持呼叫空托盘") -@RequestMapping("api/pda/callEmpty") -@Slf4j -public class CallVehicleController { - - private final CallVehicleService callVehicleService; - - @PostMapping("/queryPoint") - @Log("查询区域点位") - @ApiOperation("查询区域点位") - public ResponseEntity queryPoint() { - return new ResponseEntity<>(callVehicleService.queryPoint(), HttpStatus.OK); - } - - @PostMapping("/confirm") - @Log("呼叫空托盘确定") - @ApiOperation("呼叫空托盘确定") - public ResponseEntity confirm(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(callVehicleService.confirm(whereJson), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/CallVehicleService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/CallVehicleService.java deleted file mode 100644 index 66d4c7b..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/CallVehicleService.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.wms.pda.callvehicle.service; - -import com.alibaba.fastjson.JSONObject; - -public interface CallVehicleService { - - /** - * 查询区域点位 - * @return JSONObject - */ - JSONObject queryPoint(); - - /** - * 呼叫空托盘确定 - * @param whereJson / - * @return JSONObject - */ - JSONObject confirm(JSONObject whereJson); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/impl/CallVehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/impl/CallVehicleServiceImpl.java deleted file mode 100644 index 1f193db..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/service/impl/CallVehicleServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.nl.wms.pda.callvehicle.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.pda.callvehicle.service.CallVehicleService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Slf4j -public class CallVehicleServiceImpl implements CallVehicleService { - - private final AcsToWmsService acsToWmsService; - - @Override - public JSONObject queryPoint() { - JSONObject result = new JSONObject(); - // 1.查询区域：油漆区域 YQQY01、共挤区域 GJQY01 - JSONArray regionArr = WQL.getWO("PDA_CALLVEHICLE_01").addParam("flag", "1").process().getResultJSONArray(0); - // 2.根据区域查询对应的物料上料位 - JSONObject resultJson = new JSONObject(); - for (int i = 0; i < regionArr.size(); i++) { - JSONObject jsonRegion = regionArr.getJSONObject(i); - JSONArray pointArr = WQL.getWO("PDA_CALLVEHICLE_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); - jsonRegion.put("pointArr", pointArr); - } - resultJson.put("regionja", regionArr); - result.put("result", resultJson); - result.put("code", "1"); - result.put("desc", "查询成功"); - return result; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject confirm(JSONObject whereJson) { - JSONObject result = new JSONObject(); - // 1、准备参数：point_code、type：1为共挤区域，3为油漆区域 - JSONObject param = new JSONObject(); - - String region_id = whereJson.getString("region_id"); - JSONObject jsonObject = WQLObject.getWQLObject("sch_base_region").query("region_id ='" + region_id + "'").uniqueResult(0); - String region_code = jsonObject.getString("region_code"); - if (StrUtil.equals(region_code, "GJQY01")) param.put("type", "1"); - if (StrUtil.equals(region_code, "YQQY01")) param.put("type", "3"); - - param.put("point_code", whereJson.getString("point_code")); - param.put("vehicle_num", whereJson.getString("qty")); - // 2、调用接口 - JSONObject json = acsToWmsService.apply(param); - if (ObjectUtil.isEmpty(json) || StrUtil.equals(json.getString("status"), "200")) { - result.put("result", ""); - result.put("code", "1"); - result.put("desc", "操作成功"); - } else { - result.put("result", ""); - result.put("code", "0"); - result.put("desc", "操作失败：" + json.getString("message")); - } - return result; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/wql/PDA_CALLVEHICLE_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/wql/PDA_CALLVEHICLE_01.wql deleted file mode 100644 index 65bdadd..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/callvehicle/wql/PDA_CALLVEHICLE_01.wql +++ /dev/null @@ -1,75 +0,0 @@ -[交易说明] - 交易名： 手持呼叫空托盘查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_id TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - region_id, - region_code, - region_name - FROM - sch_base_region - WHERE - region_code in ('YQQY01','GJQY01') - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - point_id, - point_code, - point_name - FROM - sch_base_point - WHERE - is_used = '1' - AND is_delete = '0' - AND point_type = '1' - - OPTION 输入.region_id <> "" - region_id = 输入.region_id - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/login/test.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/login/test.java deleted file mode 100644 index 6ff556d..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/login/test.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.nl.wms.pda.login; - -/** - * @author: lyd - * @description: - * @Date: 2022/10/22 - */ -public class test { -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/login/wql/QPADSTSETSERVICE.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/login/wql/QPADSTSETSERVICE.wql deleted file mode 100644 index a2aece6..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/login/wql/QPADSTSETSERVICE.wql +++ /dev/null @@ -1,492 +0,0 @@ -[交易说明] - 交易名： 库区分页查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.searchbar TYPEAS s_string - 输入.option_type TYPEAS s_string - 输入.bag_id TYPEAS s_string - 输入.bucketunique TYPEAS s_string - 输入.class_code TYPEAS s_string - 输入.component TYPEAS s_string - 输入.pid TYPEAS s_string - 输入.accountId TYPEAS s_string - 输入.workprocedure_code TYPEAS s_string - 输入.dict_type TYPEAS s_string - - - - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - PAGEQUERY - SELECT - class.class_name, - class.class_code, - base.material_id, - base.material_code, - base.material_name, - base.material_spec, - base.material_type_id, - class.class_desc AS material_dtl_scode_name, - base.base_unit_id, - unit.unit_name AS base_unit_id_name, - ext.standard_weight as standard_weight1 , - "50" as standard_weight - FROM - MD_ME_MaterialBase base - LEFT JOIN md_pb_classstandard class ON class.class_id = base.material_type_id - LEFT JOIN MD_PB_MeasureUnit unit ON unit.measure_unit_id = base.base_unit_id - LEFT JOIN MD_ME_ProducMaterialExt ext ON ext.material_id = base.material_id - WHERE - 1 = 1 - OPTION 输入.searchbar <> "" - (base.material_code like "%" 输入.searchbar "%" - OR - base.material_name like "%" 输入.searchbar "%") - ENDOPTION - OPTION 输入.class_code <> "" - class.class_code = 输入.class_code - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - - IF 输入.flag = "2" - QUERY - SELECT - bag.bagrecord_id, - bag.bag_id, - bag.material_id, - material.material_code as material_code , - material.material_name as material_name, - bag.pcsn, - bag.qty_unit_id, - bag.qty_unit_name, - bag.storage_qty, - bag.return_person, - bag.status, - case bag.status when '01' then '生成' - when '02' then '组桶' - when '03' then '清洗' - else '' end as status_name, - bag.waste_type, - dictdtl.label as waste_type_name - FROM - MD_PB_BagRecord AS bag - LEFT JOIN MD_ME_MaterialBase material ON material.material_id = bag.material_id - left join sys_dict_detail dictdtl on dictdtl.value =bag.waste_type and dictdtl.dict_id='46' - WHERE - 1 =1 - OPTION 输入.bag_id <> "" - bag.bag_id = 输入.bag_id - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "3" - QUERY - SELECT - curdate( ) AS create_date, - bag.bagrecord_id, - bag.bag_id, - bag.material_id, - ext_id, - material.material_code, - material.material_name, - bag.print_type, - bag.return_person, - bag.pcsn, - bag.storage_qty, - bag.print_times, - DATE_FORMAT( bag.input_time, '%Y-%m-%d' ) as input_time - FROM - MD_PB_BagRecord AS bag - LEFT JOIN md_me_materialbase AS material ON material.material_id = bag.material_id - where 1=1 - OPTION 输入.bag_id <> "" - bag.bag_id = 输入.bag_id - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "4" - QUERY - SELECT - max( sys_user.user_id )as accountId, - max( sys_user.username ) as username, - max( sys_roles_menus.menu_id ) as menu_id, - max( sys_menu.component ) as component, - max( sys_menu.path ) as path, - max( sys_menu.NAME ) as name - FROM - sys_user AS sys_user - LEFT JOIN sys_users_roles AS sys_users_roles ON sys_users_roles.user_id = sys_user.user_id - LEFT JOIN sys_role AS sys_role ON sys_role.role_id = sys_users_roles.role_id - LEFT JOIN sys_roles_menus AS sys_roles_menus ON sys_roles_menus.role_id = sys_role.role_id - LEFT JOIN sys_menu AS sys_menu ON sys_menu.menu_id = sys_roles_menus.menu_id - WHERE - sys_menu.path LIKE 'RF%' - AND sys_menu.hidden = 1 - OPTION 输入.accountId <> "" - sys_user.user_id = 输入.accountId - ENDOPTION - OPTION 输入.component <> "" - sys_menu.component = 输入.component - ENDOPTION - OPTION 输入.pid <> "" - sys_menu.pid = 输入.pid - ENDOPTION - - GROUP BY - sys_menu.menu_id, - sys_menu.title, - sys_menu.component, - sys_menu.path, - sys_menu.NAME, - sys_menu.menu_sort - ORDER BY sys_menu.menu_sort - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "5" - QUERY - SELECT - bucket.bucket_record_id, - bucket.bucketunique, - bucket.material_id, - bucket.print_type, - material_code, - material_name, - bucket.pcsn, - bucket.qty_unit_id, - bucket.qty_unit_name, - bucket.storage_qty, - bucket.STATUS, - bucket.record_order, - DATE_FORMAT( bucket.create_time, '%Y-%m-%d' ) AS date, - DATE_FORMAT( bucket.create_time, '%Y-%m-%d' ) as input_time, - ext_id, - bucket.record_order, - bucket.is_active, - "否" as is_new_name, - "0" as is_new, - case bucket.status when '01' then '生成' - when '02' then '组盘' - when '03' then '入库' - when '04' then '出库' - when '05' then '入立库' - else '' end as status_name - FROM - md_pb_bucketrecord bucket - LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id - where 1=1 - OPTION 输入.bucketunique <> "" - bucket.bucketunique = 输入.bucketunique - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "6" - QUERY - SELECT - bag.bag_id, - bag.material_id, - material.material_code, - material.material_name, - bag.print_type, - bag.storage_qty , - "否" as is_new_name, - "0" as is_new, - bag.pcsn, - bag.return_person, - DATE_FORMAT( bag.input_time, '%Y-%m-%d' ) AS date, - DATE_FORMAT( bag.input_time, '%Y-%m-%d' ) AS input_time, - bag.bucketunique, - ext_id - FROM - MD_PB_BagRecord AS bag - LEFT JOIN md_me_materialbase AS material ON material.material_id = bag.material_id - where 1=1 - OPTION 输入.bucketunique <> "" - bag.bucketunique = 输入.bucketunique - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "7" - QUERY - SELECT - bag.bag_id, - bag.material_id, - material.material_code, - material.material_name, - bag.print_type, - bag.storage_qty, - bag.pcsn, - "是" as is_new_name, - "1" as is_new, - bag.bucketunique - FROM - MD_PB_BagRecord AS bag - LEFT JOIN md_me_materialbase AS material ON material.material_id = bag.material_id - where 1=1 - OPTION 输入.bag_id <> "" - bag.bag_id = 输入.bag_id - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "8" - QUERY - SELECT - curdate( ) AS create_date, - DATE_FORMAT( bucket.create_time, '%Y-%m-%d' ) as input_time, - ext_id, - bucket.bucket_record_id, - bucket.record_order, - bucket.is_active, - bucket.bucketunique, - bucket.material_id, - material_code, - material_name, - bucket.pcsn, - bucket.qty_unit_id, - bucket.qty_unit_name, - bucket.storage_qty, - bucket.print_type - FROM - md_pb_bucketrecord bucket - LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id - WHERE - 1 =1 - OPTION 输入.bucketunique <> "" - bucket.bucketunique = 输入.bucketunique - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "9" - QUERY - SELECT - bucket.bucket_record_id, - bucket.bucketunique, - bucket.material_id, - material_code, - material_name, - bucket.pcsn, - bucket.qty_unit_id, - bucket.qty_unit_name, - bucket.storage_qty, - bucket.STATUS, - case bucket.status when '01' then '生成' - when '02' then '组盘' - when '03' then '入库' - when '04' then '出库' - when '05' then '入立库' - else '' end as status_name - FROM - md_pb_bucketrecord bucket - LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id - where 1=1 - OPTION 输入.bucketunique <> "" - bucket.bucketunique = 输入.bucketunique - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "10" - QUERY - SELECT - dtl.VALUE AS waste_type, - dtl.label AS waste_type_name - FROM - sys_dict dict - LEFT JOIN sys_dict_detail dtl ON dict.dict_id = dtl.dict_id - WHERE - dict.NAME = 'MD_MATERIAL_WASTE_TYPE' - ENDSELECT - ENDQUERY - ENDIF - - - IF 输入.flag = "11" - PAGEQUERY - SELECT - device.device_id, - device.device_code, - device.device_name, - device.device_model, - device.device_specification, - device.workprocedure_id, - device.workprocedure_code, - device.workprocedure_name - FROM - em_bi_deviceinfo device - WHERE - 1 = 1 - OPTION 输入.searchbar <> "" - (device.device_code like "%" 输入.searchbar "%" - OR - device.device_name like "%" 输入.searchbar "%") - ENDOPTION - OPTION 输入.workprocedure_code <> "" - device.workprocedure_code = 输入.workprocedure_code - ENDOPTION - ENDSELECT - ENDPAGEQUERY - ENDIF - - IF 输入.flag = "12" - QUERY - SELECT - bucket.bucket_record_id, - bucket.bucketunique, - bucket.material_id, - material_code, - material_name, - bucket.pcsn, - bucket.qty_unit_id, - bucket.qty_unit_name, - bucket.storage_qty, - bucket.STATUS, - bucket.record_order, - case bucket.status when '01' then '生成' - when '02' then '组盘' - when '03' then '入库' - when '04' then '出库' - when '05' then '入立库' - when '06' then '线下处理' - else '' end as status_name, - case bucket.status when '06' then '1' - else '0' end as is_offline_hand - FROM - md_pb_bucketrecord bucket - LEFT JOIN md_me_materialbase material ON material.material_id = bucket.material_id - where 1=1 - and bucket.status in(01,02,03,06) - OPTION 输入.bucketunique <> "" - bucket.bucketunique = 输入.bucketunique - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "13" - QUERY - SELECT - bucket.*, - mb.material_code, - mb.ext_id, - mb.material_name, - DATE_FORMAT( bucket.create_time, '%Y-%m-%d' ) as input_time - FROM - pdm_bi_formulabucketrecord bucket - LEFT JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id - WHERE - 1=1 - AND - bucket.bucketunique = 输入.bucketunique - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "14" - QUERY - SELECT - bucket.*, - mb.material_code, - mb.material_name, - mb.ext_id, - DATE_FORMAT( bucket.create_time, '%Y-%m-%d' ) as input_time - FROM - md_pb_bucketrecord bucket - LEFT JOIN md_me_materialbase mb ON mb.material_id = bucket.material_id - WHERE - 1=1 - AND - bucket.bucketunique = 输入.bucketunique - AND - bucket.status IN ('01','02','03') - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "15" - QUERY - SELECT - detaial.label, - detaial.`value` - FROM - sys_dict_detail detaial - LEFT JOIN sys_dict dict ON dict.dict_id = detaial.dict_id - WHERE - dict.`name` = 输入.dict_type - OPTION 输入.dict_type = "sch_area_type" - detaial.value IN ('22','23','24') - ENDOPTION - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "16" - QUERY - SELECT - point.point_id, - point.point_code, - point.point_name - FROM - sch_base_point point - WHERE - point_name LIKE '分拣机械手%' - and device_point_type='01' - ENDSELECT - ENDQUERY - ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java deleted file mode 100644 index 4e283d4..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/rest/SendMaterialController.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.nl.wms.pda.sendmaterial.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.pda.sendmaterial.service.SendMaterialService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@Api(tags = "手持送料") -@RequestMapping("api/pda/sendMaterial") -@Slf4j -public class SendMaterialController { - - private final SendMaterialService sendMaterialService; - - @PostMapping("/queryPoint") - @Log("查询区域点位") - @ApiOperation("查询区域点位") - public ResponseEntity queryPoint() { - return new ResponseEntity<>(sendMaterialService.queryPoint(), HttpStatus.OK); - } - - @PostMapping("/confirm") - @Log("送料确定") - @ApiOperation("送料确定") - public ResponseEntity confirm(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(sendMaterialService.confirm(whereJson), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/SendMaterialService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/SendMaterialService.java deleted file mode 100644 index 8e00ec0..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/SendMaterialService.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.wms.pda.sendmaterial.service; - -import com.alibaba.fastjson.JSONObject; - -public interface SendMaterialService { - - /** - * 查询区域点位 - * @return JSONObject - */ - JSONObject queryPoint(); - - /** - * 送料确定 - * @param whereJson / - * @return JSONObject - */ - JSONObject confirm(JSONObject whereJson); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java deleted file mode 100644 index 3253249..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/service/impl/SendMaterialServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.nl.wms.pda.sendmaterial.service.impl; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.pda.sendmaterial.service.SendMaterialService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Slf4j -public class SendMaterialServiceImpl implements SendMaterialService { - - private final AcsToWmsService acsToWmsService; - - @Override - public JSONObject queryPoint() { - JSONObject result = new JSONObject(); - // 1.查询区域：豪凯区域 HKQY01、共挤区域 GJQY01 - JSONArray regionArr = WQL.getWO("PDA_SENDMATERIAL_01").addParam("flag", "1").process().getResultJSONArray(0); - // 2.根据区域查询对应的物料上料位 - JSONObject resultJson = new JSONObject(); - for (int i = 0; i < regionArr.size(); i++) { - JSONObject jsonRegion = regionArr.getJSONObject(i); - JSONArray pointArr = WQL.getWO("PDA_SENDMATERIAL_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); - jsonRegion.put("pointArr", pointArr); - } - resultJson.put("regionja", regionArr); - result.put("result", resultJson); - result.put("code", "1"); - result.put("desc", "查询成功"); - return result; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject confirm(JSONObject whereJson) { - JSONObject result = new JSONObject(); - // 1、准备参数：point_code、type：2为共挤区域，8为豪凯区域 - JSONObject param = new JSONObject(); - - String region_id = whereJson.getString("region_id"); - JSONObject jsonObject = WQLObject.getWQLObject("sch_base_region").query("region_id ='" + region_id + "'").uniqueResult(0); - String region_code = jsonObject.getString("region_code"); - if (StrUtil.equals(region_code, "GJQY01")) param.put("type", "2"); - if (StrUtil.equals(region_code, "HKQY01")) param.put("type", "8"); - - param.put("point_code", whereJson.getString("point_code")); - param.put("material_num", whereJson.getString("qty")); - // 2、调用接口 - JSONObject json = acsToWmsService.apply(param); - if (ObjectUtil.isEmpty(json) || StrUtil.equals(json.getString("status"), "200")) { - result.put("result", ""); - result.put("code", "1"); - result.put("desc", "操作成功"); - } else { - result.put("result", ""); - result.put("code", "0"); - result.put("desc", "操作失败：" + json.getString("message")); - } - return result; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/wql/PDA_SENDMATERIAL_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/wql/PDA_SENDMATERIAL_01.wql deleted file mode 100644 index 4632d02..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendmaterial/wql/PDA_SENDMATERIAL_01.wql +++ /dev/null @@ -1,75 +0,0 @@ -[交易说明] - 交易名： 手持送料查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_id TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - region_id, - region_code, - region_name - FROM - sch_base_region - WHERE - region_code in ('HKQY01','GJQY01') - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - point_id, - point_code, - point_name - FROM - sch_base_point - WHERE - is_used = '1' - AND is_delete = '0' - AND point_type = '3' - - OPTION 输入.region_id <> "" - region_id = 输入.region_id - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java deleted file mode 100644 index 150fb22..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/rest/SendVehicleController.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.nl.wms.pda.sendvehicle.rest; - -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.logging.annotation.Log; -import org.nl.wms.pda.callvehicle.service.CallVehicleService; -import org.nl.wms.pda.sendmaterial.service.SendMaterialService; -import org.nl.wms.pda.sendvehicle.service.SendVehicleService; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@Api(tags = "手持送空托盘") -@RequestMapping("api/pda/sendEmpty") -@Slf4j -public class SendVehicleController { - - private final SendVehicleService sendVehicleService; - - @PostMapping("/queryPoint") - @Log("查询区域点位") - @ApiOperation("查询区域点位") - public ResponseEntity queryPoint() { - return new ResponseEntity<>(sendVehicleService.queryPoint(), HttpStatus.OK); - } - - @PostMapping("/confirm") - @Log("送空托盘确定") - @ApiOperation("送空托盘确定") - public ResponseEntity confirm(@RequestBody JSONObject whereJson) { - return new ResponseEntity<>(sendVehicleService.confirm(whereJson), HttpStatus.OK); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/SendVehicleService.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/SendVehicleService.java deleted file mode 100644 index f4d5ad0..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/SendVehicleService.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.nl.wms.pda.sendvehicle.service; - -import com.alibaba.fastjson.JSONObject; - -public interface SendVehicleService { - - /** - * 查询区域点位 - * @return JSONObject - */ - JSONObject queryPoint(); - - /** - * 送空托盘确定 - * @param whereJson / - * @return JSONObject - */ - JSONObject confirm(JSONObject whereJson); -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/impl/SendVehicleServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/impl/SendVehicleServiceImpl.java deleted file mode 100644 index 6a0f17a..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/service/impl/SendVehicleServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.nl.wms.pda.sendvehicle.service.impl; - -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.ext.acs.service.AcsToWmsService; -import org.nl.wms.pda.sendvehicle.service.SendVehicleService; -import org.nl.wms.sch.tasks.RegionTypeEnum; - - -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Slf4j -public class SendVehicleServiceImpl implements SendVehicleService { - - private final AcsToWmsService acsToWmsService; - - @Override - public JSONObject queryPoint() { - JSONObject result = new JSONObject(); - // 1.查询区域：输送区域 SSX01、油漆区域 YQQY01 - JSONArray regionArr = WQL.getWO("PDA_SENDVEHICLE_01").addParam("flag", "1").process().getResultJSONArray(0); - // 2.根据区域查询对应的物料上料位 - JSONObject resultJson = new JSONObject(); - for (int i = 0; i < regionArr.size(); i++) { - JSONObject jsonRegion = regionArr.getJSONObject(i); - if (StrUtil.equals(jsonRegion.getString("region_id"), RegionTypeEnum.SSX.getId())) { - JSONArray pointArr = WQL.getWO("PDA_SENDVEHICLE_01").addParam("flag", "2").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); - jsonRegion.put("pointArr", pointArr); - } else { - JSONArray pointArr = WQL.getWO("PDA_SENDVEHICLE_01").addParam("flag", "3").addParam("region_id", jsonRegion.getString("region_id")).process().getResultJSONArray(0); - jsonRegion.put("pointArr", pointArr); - } - } - resultJson.put("regionja", regionArr); - result.put("result", resultJson); - result.put("code", "1"); - result.put("desc", "查询成功"); - return result; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject confirm(JSONObject whereJson) { - JSONObject result = new JSONObject(); - // 1、准备参数：point_code、type：6为输送线区域，5为油漆区域 - JSONObject param = new JSONObject(); - - String region_id = whereJson.getString("region_id"); - JSONObject jsonObject = WQLObject.getWQLObject("sch_base_region").query("region_id ='" + region_id + "'").uniqueResult(0); - String region_code = jsonObject.getString("region_code"); - if (StrUtil.equals(region_code, "SSX01")) param.put("type","6"); - if (StrUtil.equals(region_code, "YQQY01")) param.put("type","5"); - - param.put("point_code",whereJson.getString("point_code")); - param.put("vehicle_code",whereJson.getString("vehicle_code")); - param.put("vehicle_num",whereJson.getString("qty")); - // 2、调用接口 - JSONObject json = acsToWmsService.apply(param); - if (StrUtil.equals(json.getString("status"), "200")) { - result.put("result", ""); - result.put("code", "1"); - result.put("desc", "操作成功"); - } else { - result.put("result", ""); - result.put("code", "0"); - result.put("desc", "操作失败："+json.getString("message")); - } - return result; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/wql/PDA_SENDVEHICLE_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/wql/PDA_SENDVEHICLE_01.wql deleted file mode 100644 index b8bb4a3..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/sendvehicle/wql/PDA_SENDVEHICLE_01.wql +++ /dev/null @@ -1,96 +0,0 @@ -[交易说明] - 交易名： 手持送空托盘查询 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_id TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - region_id, - region_code, - region_name - FROM - sch_base_region - WHERE - region_code in ('SSX01','YQQY01') - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - point_id, - point_code, - point_name - FROM - sch_base_point - WHERE - is_used = '1' - AND is_delete = '0' - AND point_type = '6' - - OPTION 输入.region_id <> "" - region_id = 输入.region_id - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "3" - QUERY - SELECT - point_id, - point_code, - point_name - FROM - sch_base_point - WHERE - is_used = '1' - AND is_delete = '0' - AND point_type = '4' - - OPTION 输入.region_id <> "" - region_id = 输入.region_id - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtils.java similarity index 98% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtils.java index 6884c31..85a4c26 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtils.java @@ -13,7 +13,7 @@ import org.springframework.http.HttpStatus; /** * ACS连接工具类: */ -public class AcsUtil { +public class AcsUtils { public static JSONObject notifyAcs(String api, JSONArray list) { //判断是否连接ACS系统 String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("is_connect_acs").getValue(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/point/LockType.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/point/LockType.java new file mode 100644 index 0000000..04f16bc --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/point/LockType.java @@ -0,0 +1,20 @@ +package org.nl.wms.sch.base.point; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author 张江玮 + * @date 2022/11/04 12:50 + */ +@AllArgsConstructor +@Getter +public enum LockType { + + UNLOCKED("1", "未锁定"), + TASK_LOCKED("2", "任务锁定"); + + private final String code; + + private final String name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/point/PointStatus.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/point/PointStatus.java new file mode 100644 index 0000000..dff3089 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/point/PointStatus.java @@ -0,0 +1,20 @@ +package org.nl.wms.sch.base.point; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author 张江玮 + * @date 2022/11/04 12:48 + */ +@AllArgsConstructor +@Getter +public enum PointStatus { + + EMPTY("1", "空位"), + HAS_VEHICLE("2", "有载具"); + + private final String code; + + private final String name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/region/RegionEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/region/RegionEnum.java new file mode 100644 index 0000000..536a2b1 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/base/region/RegionEnum.java @@ -0,0 +1,22 @@ +package org.nl.wms.sch.base.region; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 区域枚举 + */ +@AllArgsConstructor +@Getter +public enum RegionEnum { + + JL("1585920580597714944", "JL", "接料区"), + ZC("1585921595338264576", "ZC", "暂存区"), + JJ("1585921750871445504", "JJ", "交接区"); + + private final String id; + + private final String code; + + private final String name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index 1473a84..a0bfd2d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -4,8 +4,8 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import org.nl.wms.sch.AcsUtil; -import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.AcsUtils; +import org.nl.wms.sch.task.dto.AcsTaskDTO; import java.util.List; @@ -24,7 +24,7 @@ public abstract class AbstractAcsTask { * @author ldjun * @created 2020年6月12日 下午5:55:25 */ - public List schedule() { + public List schedule() { this.autoCreate(); this.findStartPoint(); this.findNextPoint(); @@ -36,7 +36,7 @@ public abstract class AbstractAcsTask { * * @return */ - public abstract List addTask(); + public abstract List addTask(); /** * @param taskObj 代表一条任务对象 @@ -91,7 +91,7 @@ public abstract class AbstractAcsTask { * @created 2020年6月12日 下午5:52:28 */ public JSONObject notifyAcs(String task_id) { - return AcsUtil.notifyAcs("api/wms/task", null); + return AcsUtils.notifyAcs("api/wms/task", null); } /** @@ -101,18 +101,18 @@ public abstract class AbstractAcsTask { * @created 2020年6月12日 下午5:52:28 */ public JSONObject notifyAcs(JSONArray jsonArray) { - return AcsUtil.notifyAcs("api/wms/task", jsonArray); + return AcsUtils.notifyAcs("api/wms/task", jsonArray); } /** * */ public JSONObject immediateNotifyAcs() { - List taskList = this.schedule(); + List taskList = this.schedule(); if (ObjectUtil.isNotEmpty(taskList)) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); - return AcsUtil.notifyAcs("api/wms/task", arr); + return AcsUtils.notifyAcs("api/wms/task", arr); } return null; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java index af2d49e..a057372 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java @@ -8,8 +8,8 @@ import com.alibaba.fastjson.JSONObject; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.AcsUtil; -import org.nl.wms.sch.tasks.AcsTaskDto; +import org.nl.wms.sch.AcsUtils; +import org.nl.wms.sch.task.dto.AcsTaskDTO; import org.reflections.Reflections; import org.springframework.stereotype.Component; @@ -23,7 +23,7 @@ import java.util.Set; @Component public class AutoCreateTask { // 下发acs的任务集合 - private List taskList = null; + private List taskList = null; private Set> subTypes = null; WQLObject taskTab = null; @@ -48,7 +48,7 @@ public class AutoCreateTask { Object obj = clz.newInstance(); //Method m = obj.getClass().getDeclaredMethod("schedule"); Method m = obj.getClass().getMethod("schedule"); - List tasks = (List) m.invoke(obj); + List tasks = (List) m.invoke(obj); if (ObjectUtil.isNotEmpty(tasks)) { taskList.addAll(tasks); } @@ -73,7 +73,7 @@ public class AutoCreateTask { String api = "api/wms/task"; log.info("下发acs任务的参数为:{}", arr.toString()); - JSONObject result = AcsUtil.notifyAcs(api, arr); + JSONObject result = AcsUtils.notifyAcs(api, arr); log.info("下发acs任务的返回结果为:{}", result.toString()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index fe130b5..0fe2b78 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -79,7 +79,7 @@ public class PointServiceImpl implements PointService { String[] types = split[j].split("-"); typeArr.put(types[0], types[1]); } - object.put("point_status_name", typeArr.getString(point_type)); + object.put("point_type_name", typeArr.getString(point_type)); } res.add(object); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java index 4faf50e..09766bb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/RegionServiceImpl.java @@ -142,16 +142,20 @@ public class RegionServiceImpl implements RegionService { * label,value */ JSONArray res = new JSONArray(); - String point_status_explain = findById(region_id).getPoint_status_explain(); - if (ObjectUtil.isEmpty(point_status_explain)) return res; - String[] explain = point_status_explain.split("，"); - for (int i = 0; i < explain.length; i++) { - String[] status = explain[i].split("-"); - JSONObject point_status = new JSONObject(); - point_status.put("label", status[1]); - point_status.put("value", status[0]); - res.add(point_status); + RegionDto dto = findById(region_id); + if (ObjectUtil.isNotEmpty(dto)) { + String point_status_explain = dto.getPoint_status_explain(); + if (ObjectUtil.isEmpty(point_status_explain)) return res; + String[] explain = point_status_explain.split("，"); + for (int i = 0; i < explain.length; i++) { + String[] status = explain[i].split("-"); + JSONObject point_status = new JSONObject(); + point_status.put("label", status[1]); + point_status.put("value", status[0]); + res.add(point_status); + } } + return res; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CallEmptyVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CallEmptyVehicleTask.java new file mode 100644 index 0000000..b35c271 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CallEmptyVehicleTask.java @@ -0,0 +1,173 @@ +package org.nl.wms.sch.task; + +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.sch.base.point.LockType; +import org.nl.wms.sch.manage.AbstractAcsTask; +import org.nl.wms.sch.task.dto.AcsTaskDTO; +import org.nl.wms.sch.task.util.TaskUtils; +import org.nl.wms.util.CommonUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.List; + +/** + * 纽迪希亚3叫空载具任务 + * + * @author 张江玮 + * @date 2022/11/01 10:12 + */ +@Service +@NoArgsConstructor +@Slf4j +public class CallEmptyVehicleTask extends AbstractAcsTask { + + private static final String THIS_CLASS_NAME = CallEmptyVehicleTask.class.getName(); + + /** + * 添加任务进行下发 + * + * @return 所有这个类处理的已确认起点和终点任务 + */ + @Override + public List addTask() { + JSONArray tasks = WQLObject + .getWQLObject("sch_base_task") + .query("task_status = " + TaskStatus.START_AND_END.getCode() + " AND handle_class = " + THIS_CLASS_NAME) + .getResultJSONArray(0); + + ArrayList acsTasks = new ArrayList<>(); + for (Object o : tasks) { + JSONObject task = (JSONObject) o; + + AcsTaskDTO acsTask = AcsTaskDTO + .builder() + .task_id(task.getString("task_id")) + .task_code(task.getString("task_code")) + .task_type(task.getString("acs_task_type")) + .start_device_code(task.getString("point_code1")) + .next_device_code(task.getString("point_code2")) + .vehicle_code(task.getString("vehicle_code")) + .vehicle_type(task.getString("vehicle_type")) + .priority(task.getString("priority")) + .remark(task.getString("remark")) + .build(); + + acsTasks.add(acsTask); + } + + return acsTasks; + } + + /** + * acs请求更新任务状态 + * + * @param taskJSON 代表一条任务对象 + * @param status 代表wcs任务完成状态： //0：acs,取消，:执行中,2:完成 + */ + @Override + public void updateTaskStatus(JSONObject taskJSON, String status) { + + } + + /** + * 创建叫空托盘任务 + * + * @param param String point_id 点位标识 + * @return 返回任务标识 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public String createTask(JSONObject param) { + WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); + JSONObject point = pointTable + .query("point_id = " + param.getString("point_id")) + .uniqueResult(0); + if (ObjectUtil.isEmpty(point)) { + throw new BadRequestException("点位不存在"); + } + + JSONObject task = new JSONObject(); + String taskId = IdUtil.getSnowflake(1L, 1L).nextIdStr(); + task.put("task_id", taskId); + task.put("task_code", CodeUtil.getNewCode("TASK_CODE")); + task.put("task_type", TaskType.CALL_EMPTY_VEHICLE.getCode()); + task.put("task_status", TaskStatus.SURE_END.getCode()); + task.put("point_code2", point.getString("point_code")); + task.put("handle_class", THIS_CLASS_NAME); + task.put("create_mode", CreateMode.SCCJ.getCode()); + CommonUtils.addCommonColum(task); + WQLObject.getWQLObject("sch_base_task").insert(task); + + point.put("lock_type", "2"); + CommonUtils.addUpdateColum(point); + pointTable.update(point); + + return taskId; + } + + /** + * 完成任务 + * + * @param taskId 任务标识 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void forceFinish(String taskId) { + + } + + /** + * 取消任务 + * + * @param taskId 任务标识 + */ + @Override + public void cancel(String taskId) { + + } + + /** + * 确定当前处理类创建的任务的起点 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void findStartPoint() { + WQLObject taskTable = WQLObject.getWQLObject("sch_base_task"); + JSONArray tasks = taskTable + .query("task_status = " + TaskStatus.SURE_END.getCode() + " AND handle_class = " + THIS_CLASS_NAME) + .getResultJSONArray(0); + + for (Object o : tasks) { + JSONObject point = WQL.getWO("TASK") + .addParam("flag", "1") + .process() + .uniqueResult(0); + + if (ObjectUtil.isNotEmpty(point)) { + JSONObject task = (JSONObject) o; + + task.put("task_status", TaskStatus.START_AND_END.getCode()); + task.put("point_code1", point.getString("point_code")); + task.put("vehicle_code", point.getString("vehicle_code")); + CommonUtils.addUpdateColum(task); + taskTable.update(task); + + JSONObject lockPoint = new JSONObject(); + lockPoint.put("lock_type", LockType.TASK_LOCKED.getCode()); + WQLObject.getWQLObject("sch_base_point").update(lockPoint, "point_id = " + point.getString("point_id")); + } + } + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CreateMode.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CreateMode.java new file mode 100644 index 0000000..0e25f94 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/CreateMode.java @@ -0,0 +1,24 @@ +package org.nl.wms.sch.task; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 生成方式枚举类 + * + * @author 张江玮 + * @date 2022/11/01 15:57 + */ +@AllArgsConstructor +@Getter +public enum CreateMode { + + PCCS("1", "PC产生"), + ACSSQ("2", "ACS申请"), + SCCJ("3", "手持创建"), + WBJK("4", "外部接口"); + + private final String code; + + private final String name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskFinishedType.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskFinishedType.java new file mode 100644 index 0000000..8483cf2 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskFinishedType.java @@ -0,0 +1,22 @@ +package org.nl.wms.sch.task; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 任务完成类型枚举类 + * + * @author 张江玮 + * @date 2022/11/04 12:36 + */ +@AllArgsConstructor +@Getter +public enum TaskFinishedType { + + AUTO("1", "自动"), + MANUAL("2", "手动"); + + private final String code; + + private final String name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskStatus.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskStatus.java new file mode 100644 index 0000000..3dd21ba --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskStatus.java @@ -0,0 +1,27 @@ +package org.nl.wms.sch.task; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 任务状态枚举类 + * + * @author 张江玮 + * @date 2022/11/01 16:09 + */ +@AllArgsConstructor +@Getter +public enum TaskStatus { + + CREATED("1", "生成"), + SURE_START("2", "确定起点"), + SURE_END("3", "确定终点"), + START_AND_END("4", "起点终点确认"), + ISSUE("5", "下发"), + EXECUTING("6", "执行中"), + FINISHED("7", "完成"); + + private final String code; + + private final String name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskType.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskType.java new file mode 100644 index 0000000..b3077d3 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/TaskType.java @@ -0,0 +1,25 @@ +package org.nl.wms.sch.task; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 纽迪希亚3任务类型枚举类 + * + * @author 张江玮 + * @date 2022/11/01 15:20 + */ +@AllArgsConstructor +@Getter +public enum TaskType { + + CALL_EMPTY_VEHICLE("HJKC", "呼叫空车"), + SEND_FULL_VEHICLE("HJSMC", "呼叫送满车"), + CALL_MATERIAL("HJYLCK", "呼叫原料出库"), + SEND_EMPTY_VEHICLE("HJKCRK", "呼叫空车入库"), + SEND_RESIDUES_MATERIAL("HJYLRK", "呼叫余料入库"); + + private final String code; + + private final String name; +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AcsTaskDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/dto/AcsTaskDTO.java similarity index 91% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AcsTaskDto.java rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/task/dto/AcsTaskDTO.java index c76d653..7e44bd0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/AcsTaskDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/dto/AcsTaskDTO.java @@ -1,11 +1,11 @@ -package org.nl.wms.sch.tasks; +package org.nl.wms.sch.task.dto; import lombok.Builder; import lombok.Data; @Data @Builder -public class AcsTaskDto { +public class AcsTaskDTO { //任务标识 private String task_id; //任务编码 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java new file mode 100644 index 0000000..18ffd7f --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/util/TaskUtils.java @@ -0,0 +1,50 @@ +package org.nl.wms.sch.task.util; + +import com.alibaba.fastjson.JSONObject; +import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.wms.sch.base.point.LockType; +import org.nl.wms.sch.base.point.PointStatus; +import org.nl.wms.sch.task.TaskFinishedType; +import org.nl.wms.sch.task.TaskStatus; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +/** + * 纽迪希亚3任务工具类 + * + * @author 张江玮 + * @date 2022/11/01 15:11 + */ +@Component +public class TaskUtils { + + @Transactional(rollbackFor = Exception.class) + public void finished(String taskId, TaskFinishedType taskFinishedType) { + WQLObject taskTable = WQLObject.getWQLObject("sch_base_task"); + JSONObject task = taskTable + .query("task_id = " + taskId) + .uniqueResult(0); + + WQLObject pointTable = WQLObject.getWQLObject("sch_base_point"); + JSONObject startPoint = pointTable + .query("task_code = " + task.getString("point_code1")) + .uniqueResult(0); + JSONObject nextPoint = pointTable + .query("task_code = " + task.getString("point_code2")) + .uniqueResult(0); + + task.put("finished_type", taskFinishedType.getCode()); + task.put("task_status", TaskStatus.FINISHED.getCode()); + taskTable.update(task); + + nextPoint.put("point_status", PointStatus.HAS_VEHICLE.getCode()); + nextPoint.put("lock_type", LockType.UNLOCKED.getCode()); + nextPoint.put("vehicle_code", startPoint.getString("vehicle_code")); + pointTable.update(nextPoint); + + startPoint.put("point_status", PointStatus.EMPTY.getCode()); + startPoint.put("lock_type", LockType.UNLOCKED.getCode()); + startPoint.put("vehicle_code", ""); + pointTable.update(startPoint); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/wql/TASK.wql similarity index 58% rename from lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql rename to lms/nladmin-system/src/main/java/org/nl/wms/sch/task/wql/TASK.wql index 0e1582e..c8c818a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_yqxSendMaterial_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/task/wql/TASK.wql @@ -1,5 +1,5 @@ [交易说明] - 交易名： 油漆线送料请求 + 交易名： 任务分页查询 所属模块： 功能简述： 版权所有： @@ -13,11 +13,7 @@ ################################################# ## 表字段对应输入参数 ################################################# - 输入.flag TYPEAS s_string - 输入.region_code TYPEAS s_string - 输入.material_id TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - + 输入.flag TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -41,22 +37,22 @@ # 3、业务主过程 # ########################################## - IF 输入.flag = "1" - QUERY - SELECT - p.point_id, - p.point_code, - p.point_name + IF 输入.flag = "1" + QUERY + SELECT + point.point_id, + point.point_code, + vehicle.vehicle_code FROM - SCH_BASE_Point p + sch_base_point point + LEFT JOIN md_pb_vehicle vehicle ON point.vehicle_code = vehicle.vehicle_code WHERE - lock_type = '1' - AND is_used = '1' - AND is_delete = '0' - and (point_code = 'SSX01A2' or point_code = 'SSX02A1') - ENDSELECT - ENDQUERY - ENDIF - - - + point.is_used = '1' + AND point.is_delete = '0' + AND point.lock_type = '1' + AND point.region_id = 1585921595338264576 + AND point.point_status = '2' + AND vehicle.vehicle_status = '1' + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PointToPointTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PointToPointTask.java deleted file mode 100644 index 4e6e115..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/PointToPointTask.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.nl.wms.sch.tasks; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 普通点对点任务 - */ -@Service -public class PointToPointTask extends AbstractAcsTask { - - @Override - @Transactional - public void updateTaskStatus(JSONObject taskObj, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - - String task_id = taskObj.getString("task_id"); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - if (StrUtil.equals(status,"0")) { - // 取消删除任务 - taskTab.delete("task_id = '"+task_id+"'"); - } - - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { - // 更新任务状态为执行中 - jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", taskObj.getString("car_no")); - taskTab.update(jsonTask); - } - - if(StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { - // 完成 - jsonTask.put("task_status",TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonTask.put("update_optname", SecurityUtils.getCurrentUsername()); - jsonTask.put("update_time", DateUtil.now()); - taskTab.update(jsonTask); - } - - } - - - - @Override - @Transactional - public String createTask(JSONObject form) { - return null; - } - - @Override - public void forceFinish(String task_id) { - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); - } - - @Override - public List addTask() { - return null; - } - - - - - @Override - public void cancel(String task_id) { - - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/RegionTypeEnum.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/RegionTypeEnum.java deleted file mode 100644 index 21ce4b5..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/RegionTypeEnum.java +++ /dev/null @@ -1,44 +0,0 @@ -package org.nl.wms.sch.tasks; - -/** - * 任务状态枚举 - */ -public enum RegionTypeEnum { - CPQYA(1, "CPQYA01", "成品区域A","1557538851726168064"), - YSQA(2, "YSQA01", "养生A区","1557539288307077120"), - YSQB(3, "YSQB01", "养生B区","1557539423292362752"), - GJQY(4, "GJQY01", "共挤区","1557539744848678912"), - YQQY(5, "YQQY01", "油漆区","1557913112412295168"), - DPJQA(6, "DPJQA01", "叠盘架A区","1558015562792177664"), - DPJQB(7, "DPJQB01", "叠盘架B区","1558015634472833024"), - KTPHCQA(8, "KTPHCQA01", "空托盘缓存A区","1558015810096730112"), - KTPHCQB(9, "KTPHCQB01", "空托盘缓存B区","1558015870570205184"), - HKQY(10, "HKQY01", "豪凯区域","1564862312702152704"), - SSX(12, "SSX01", "输送线区域","1559374522581389312"), - YSAQKTPQ01(13, "YSAQKTPQ01", "养生A空托盘区","1582909373552922624"); - - private int index; - private String code; - private String name; - private String id; - - public String getCode() { - return code; - } - - public String getName() { - return name; - } - - public String getId() { - return id; - } - - RegionTypeEnum(int index, String code, String name, String id) { - this.index = index; - this.id = id; - this.code = code; - this.name = name; - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java deleted file mode 100644 index 1e73ff8..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/GjxCallEmpVehicleTask.java +++ /dev/null @@ -1,429 +0,0 @@ -package org.nl.wms.sch.tasks.callEmpty; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.sch.tasks.RegionTypeEnum; -import org.nl.wms.util.IdUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -@Service -@RequiredArgsConstructor -@Slf4j -/** - * 共挤线申请空盘 - */ -public class GjxCallEmpVehicleTask extends AbstractAcsTask { - private final String THIS_CLASS = GjxCallEmpVehicleTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject taskObj, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - String task_id = taskObj.getString("task_id"); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - if (StrUtil.equals(status, "0")) { - /* - * 取消删除 - * 1.终点为叠盘架更新起点点位、等待点点位、叠盘架点位 - * 2.终点为供给线更新叠盘架点位 - */ - if (StrUtil.equals(jsonTask.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - - String point_code1 = jsonTask.getString("point_code1"); - String point_code2 = jsonTask.getString("point_code2"); - - JSONObject jsonEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - // 终点在叠盘架 - if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) { - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - // 判断此起点是否是等待点 - if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { - // 如果不是等待点更新等待点状态 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + - "' and block_num = '" + jsonStart.getString("block_num") + - "' and col_num = '" + jsonStart.getString("col_num") + - "' and row_num = '9'").uniqueResult(0); - - jsonEmpWait.put("lock_type", "1"); - pointTab.update(jsonEmpWait); - } - jsonStart.put("lock_type", "1"); - pointTab.update(jsonStart); - - // 更新终点（叠盘架状态） - jsonEnd.put("lock_type", "1"); - pointTab.update(jsonEnd); - - } else { - // 终点在供给线 - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - jsonStart.put("lock_type", "1"); - pointTab.update(jsonStart); - } - - taskTab.delete("task_id = '" + task_id + "'"); - } - - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { - // 更新任务状态为执行中 - jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", taskObj.getString("car_no")); - taskTab.update(jsonTask); - } - - if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { - /* - * 更改任务状态为完成 - * 1.终点为叠盘架更新叠盘架数量、起点点位状态、等待位状态，更新任务组状态 - * 2.终点为供给线，更新起点载数量 - */ - jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonTask.put("update_optname", SecurityUtils.getCurrentUsername()); - jsonTask.put("update_time", DateUtil.now()); - taskTab.update(jsonTask); - - // 判断终点在哪里 - String point_code1 = jsonTask.getString("point_code1"); - String point_code2 = jsonTask.getString("point_code2"); - - JSONObject jsonEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - // 终点在叠盘架 - if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) { - // 更新起点点位状态 - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - // 判断起点是不是养生A区空载具 - if (StrUtil.equals(jsonStart.getString("region_id"), RegionTypeEnum.YSAQKTPQ01.getId())) { - // 判断此起点是否是等待点 - if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { - // 如果不是等待点更新等待点状态 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + - "' and block_num = '" + jsonStart.getString("block_num") + - "' and col_num = '" + jsonStart.getString("col_num") + - "' and row_num = '9'").uniqueResult(0); - - jsonEmpWait.put("lock_type", "1"); - pointTab.update(jsonEmpWait); - } - } - - jsonStart.put("point_status", "1"); - jsonStart.put("lock_type", "1"); - jsonStart.put("vehicle_type", ""); - jsonStart.put("vehicle_code", ""); - jsonStart.put("vehicle_qty", 0); - pointTab.update(jsonStart); - - // 更新终点（叠盘架状态） - jsonEnd.put("vehicle_qty", NumberUtil.add(jsonEnd.getString("vehicle_qty"), jsonTask.getString("vehicle_qty"))); - jsonEnd.put("lock_type", "1"); - jsonEnd.put("point_status", "2"); - jsonEnd.put("vehicle_type", jsonTask.getString("vehicle_type")); - pointTab.update(jsonEnd); - - // 更新任务组状态 - JSONObject jsonTask2 = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_id <> '" + jsonTask.getString("task_id") + "'").uniqueResult(0); - jsonTask2.put("point_code1", jsonEnd.getString("point_code")); - jsonTask2.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskTab.update(jsonTask2); - } else { - // 终点在供给线线: 更新起点（叠盘架）数量 - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - jsonStart.put("vehicle_qty", NumberUtil.sub(jsonStart.getString("vehicle_qty"), "1")); - jsonStart.put("lock_type", "1"); - if (StrUtil.equals(jsonStart.getString("vehicle_qty"), "0")) { - jsonStart.put("point_status", "1"); - jsonStart.put("vehicle_type", ""); - } - pointTab.update(jsonStart); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void findStartPoint() { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 - - JSONArray taskArr = taskTab.query("is_delete = '0' and handle_class = '" + this.THIS_CLASS + "' and task_status = '" + TaskStatusEnum.SURE_END.getCode() + "'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - // 创建任务 - JSONObject jsonTask = taskArr.getJSONObject(i); - String vehicle_type = jsonTask.getString("vehicle_type"); - - // 找叠盘架是否与对应的载具类型 - JSONObject jsonDpjStart = pointTab.query("region_id = '" + RegionTypeEnum.DPJQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonDpjStart)) { - // 判断叠盘架是否有任务 有就下一个任务 - boolean is_point = this.isTask(jsonDpjStart.getString("point_code")); - if (!is_point) continue; - - // 更新任务起点 - jsonTask.put("point_code1", jsonDpjStart.getString("point_code")); - jsonTask.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskTab.update(jsonTask); - - } else { - // 判断叠盘架载具数量是否是0 - JSONObject jsonDpjStart2 = pointTab.query("region_id = '" + RegionTypeEnum.DPJQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty = '0'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonDpjStart2)) continue; - - // 判断叠盘架是否有任务 - boolean is_point = this.isTask(jsonDpjStart2.getString("point_code")); - if (!is_point) continue; - - // 找叠盘架暂存位是否有空托盘 - JSONObject map = new JSONObject(); - map.put("flag", "1"); - map.put("vehicle_type", vehicle_type); - - JSONObject jsonZcKtp = WQL.getWO("QSCH_GjxCallEmpVehicleTask").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonZcKtp)) { - // 创建任务：空载具暂存位 --> 叠盘架 - SchTaskDto dto = SchTaskDto.builder() - .task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .acs_task_type("2") - .task_name("暂存位->叠盘架空载具") - .task_status(TaskStatusEnum.START_AND_POINT.getCode()) - .point_code1(jsonZcKtp.getString("point_code")) - .point_code2(jsonDpjStart2.getString("point_code")) - .vehicle_code(jsonZcKtp.getString("vehicle_code")) - .vehicle_type(jsonZcKtp.getString("vehicle_type")) - .vehicle_qty(jsonZcKtp.getIntValue("vehicle_qty")) - .task_group_id(jsonTask.getLong("task_group_id")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - // 锁定起点 - jsonZcKtp.put("lock_type", "2"); - pointTab.update(jsonZcKtp); - } else { - // 空托盘暂存区没有就到养生A区找: 先找到出库等待点 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + - "' and row_num = '9' and can_vehicle_type = '" + vehicle_type + - "' and is_used = '1' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonEmpWait)) continue; - - JSONObject jsonStartPoint = pointTab.query("region_id = '" + jsonEmpWait.getString("region_id") + - "' and block_num = '" + jsonEmpWait.getString("block_num") + - "' and col_num = '" + jsonEmpWait.getString("col_num") + - "' and point_status = '2' and lock_type = '1' order by out_empty_seq DESC").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonStartPoint)) continue; - - // 判断找到的空载具点位是否是等待点 - if (StrUtil.equals(jsonEmpWait.getString("point_code"), jsonStartPoint.getString("point_code"))) { - // 创建 养生A区空载具等待点 --> 叠盘架 - SchTaskDto dto = SchTaskDto.builder() - .task_id(IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .acs_task_type("2") - .task_name("养生A区-> 叠盘架空载具") - .task_status(TaskStatusEnum.START_AND_POINT.getCode()) - .point_code1(jsonStartPoint.getString("point_code")) - .point_code2(jsonDpjStart2.getString("point_code")) - .vehicle_code(jsonStartPoint.getString("vehicle_code")) - .vehicle_type(jsonStartPoint.getString("vehicle_type")) - .vehicle_qty(jsonStartPoint.getIntValue("vehicle_qty")) - .task_group_id(jsonTask.getLong("task_group_id")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - // 锁起点 - jsonStartPoint.put("lock_type", "2"); - pointTab.update(jsonStartPoint); - } else { - // 判断等待点是否是 未锁定、为空载具 - if (StrUtil.equals(jsonEmpWait.getString("lock_type"), "1")) { - // 创建 养生A区空载具 --> 叠盘架 - SchTaskDto dto = SchTaskDto.builder() - .task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .acs_task_type("2") - .task_name("养生A区>叠盘架空载具") - .task_status(TaskStatusEnum.START_AND_POINT.getCode()) - .point_code1(jsonStartPoint.getString("point_code")) - .point_code2(jsonDpjStart2.getString("point_code")) - .vehicle_code(jsonStartPoint.getString("vehicle_code")) - .vehicle_type(jsonStartPoint.getString("vehicle_type")) - .vehicle_qty(jsonStartPoint.getIntValue("vehicle_qty")) - .task_group_id(jsonTask.getLong("task_group_id")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - // 锁起点 - jsonStartPoint.put("lock_type", "2"); - pointTab.update(jsonStartPoint); - // 锁等待点 - jsonEmpWait.put("lock_type", "2"); - pointTab.update(jsonEmpWait); - } else { - continue; - } - } - } - } - } - - } - - - @Override - @Transactional(rollbackFor = Exception.class) -// 虽然是养生A区，应该有二次申请，但是通过判断叠盘架是否有任务来判断做限制 - public String createTask(JSONObject form) { - /* - * 1.先生成确定终点的任务 - * 2.通过findStartPoint()找起点 - * 3.下发给ACS - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); // 生产工单表 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); //点位基础表 - - //任务表【SCH_BASE_Task】 - //判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + form.getString("point_code2") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + form.getString("point_code2") + "存在未完成的任务"); - - - - - String point_code2 = form.getString("point_code2"); - String sub_device_code = point_code2.substring(0, point_code2.indexOf("_")); - - String device_code = pointTab.query("point_code = '" + sub_device_code + "'").uniqueResult(0).getString("device_code"); - - JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); - if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); - - SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .task_name("共挤线叫空载具") - .task_status(TaskStatusEnum.SURE_END.getCode()) - .point_code2(point_code2) - .acs_task_type("2") - .vehicle_code(form.getString("vehicle_code")) - .vehicle_type(workOrderObj.getString("vehicle_type")) - .vehicle_qty(form.getIntValue("qty")) - .task_group_id(IdUtil.getLongId()) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void forceFinish(String task_id) { - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); - } - - @Override - public void cancel(String task_id) { - - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList resultList = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - - String point_code1 = json.getString("point_code1"); - //判断起点是否属于养生A区 - if (point_code1.startsWith("2")) { - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9); - } - - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(point_code1) - .next_device_code(json.getString("point_code3")) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - resultList.add(dto); - } - return resultList; - } - - @Transactional(rollbackFor = Exception.class) - public boolean isTask(String point_code) { - /* - * 判断点位是否有任务存在 - */ - WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task"); - - boolean result; - - JSONObject jsonPointCode1 = tab.query("point_code1 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode2 = tab.query("point_code2 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode3 = tab.query("point_code3 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode4 = tab.query("point_code4 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonPointCode1) && ObjectUtil.isEmpty(jsonPointCode2) && ObjectUtil.isEmpty(jsonPointCode3) && ObjectUtil.isEmpty(jsonPointCode4)) { - result = true; - } else { - result = false; - } - - return result; - } - - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java deleted file mode 100644 index 6c70069..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/YqxCallEmpVehicleTask.java +++ /dev/null @@ -1,434 +0,0 @@ -package org.nl.wms.sch.tasks.callEmpty; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.sch.tasks.RegionTypeEnum; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -@Service -@RequiredArgsConstructor -@Slf4j -public class YqxCallEmpVehicleTask extends AbstractAcsTask { - private final String THIS_CLASS = YqxCallEmpVehicleTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject taskObj, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - String task_id = taskObj.getString("task_id"); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - if (StrUtil.equals(status, "0")) { - /* - * 取消删除 - * 1.终点为叠盘架更新起点点位、等待点点位、叠盘架点位 - * 2.终点为油漆线更新叠盘架点位 - */ - if (StrUtil.equals(jsonTask.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - - String point_code1 = jsonTask.getString("point_code1"); - String point_code2 = jsonTask.getString("point_code2"); - - JSONObject jsonEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - // 终点在叠盘架 - if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQB.getId())) { - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - // 判断此起点是否是等待点 - if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { - // 如果不是等待点更新等待点状态 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + - "' and block_num = '" + jsonStart.getString("block_num") + - "' and col_num = '" + jsonStart.getString("col_num") + - "' and row_num = '9'").uniqueResult(0); - - jsonEmpWait.put("lock_type", "1"); - pointTab.update(jsonEmpWait); - } - jsonStart.put("lock_type", "1"); - pointTab.update(jsonStart); - - // 更新终点（叠盘架状态） - jsonEnd.put("lock_type", "1"); - pointTab.update(jsonEnd); - - } else { - // 终点在油漆线 - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - jsonStart.put("lock_type", "1"); - pointTab.update(jsonStart); - } - - taskTab.delete("task_id = '" + task_id + "'"); - } - - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { - // 更新任务状态为执行中 - jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", taskObj.getString("car_no")); - taskTab.update(jsonTask); - } - - if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { - /* - * 更改任务状态为完成 - * 1.终点为叠盘架更新叠盘架数量、起点点位状态、等待位状态，更新任务组状态 - * 2.终点为油漆线，更新起点载具数量 - */ - jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("update_optid", SecurityUtils.getCurrentUserId()); - jsonTask.put("update_optname", SecurityUtils.getCurrentUsername()); - jsonTask.put("update_time", DateUtil.now()); - taskTab.update(jsonTask); - - // 判断终点在哪里 - String point_code1 = jsonTask.getString("point_code1"); - String point_code2 = jsonTask.getString("point_code2"); - - JSONObject jsonEnd = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - // 终点在叠盘架 - if (StrUtil.equals(jsonEnd.getString("region_id"), RegionTypeEnum.DPJQA.getId())) { - // 更新起点点位状态 - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - // 判断起点是不是养生A区空载具 - if (StrUtil.equals(jsonStart.getString("region_id"), RegionTypeEnum.YSAQKTPQ01.getId())) { - // 判断此起点是否是等待点 - if (!StrUtil.equals(jsonStart.getString("row_num"), "9")) { - // 如果不是等待点更新等待点状态 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + jsonStart.getString("region_id") + - "' and block_num = '" + jsonStart.getString("block_num") + - "' and col_num = '" + jsonStart.getString("col_num") + - "' and row_num = '9'").uniqueResult(0); - - jsonEmpWait.put("lock_type", "1"); - pointTab.update(jsonEmpWait); - } - } - - jsonStart.put("point_status", "1"); - jsonStart.put("lock_type", "1"); - jsonStart.put("vehicle_type", ""); - jsonStart.put("vehicle_code", ""); - jsonStart.put("vehicle_qty", 0); - pointTab.update(jsonStart); - - // 更新终点（叠盘架状态） - jsonEnd.put("vehicle_qty", NumberUtil.add(jsonEnd.getString("vehicle_qty"),jsonTask.getString("vehicle_qty"))); - jsonEnd.put("lock_type", "1"); - jsonEnd.put("point_status", "2"); - jsonEnd.put("vehicle_type", jsonTask.getString("vehicle_type")); - pointTab.update(jsonEnd); - - // 更新任务组状态 - JSONObject jsonTask2 = taskTab.query("task_group_id = '" + jsonTask.getString("task_group_id") + "' and task_id <> '" + jsonTask.getString("task_id") + "'").uniqueResult(0); - // 判断叠盘架数量是否 < 需求数量 (暂时只能<需求数量) - if (jsonEnd.getIntValue("vehicle_qty") < jsonTask2.getIntValue("vehicle_qty")) { - jsonTask2.put("vehicle_qty", jsonEnd.getIntValue("vehicle_qty")); - } - jsonTask2.put("point_code1", jsonEnd.getString("point_code")); - jsonTask2.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskTab.update(jsonTask2); - } else { - // 终点在油漆线: 更新起点（叠盘架）数量 - JSONObject jsonStart = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0); - jsonStart.put("vehicle_qty",NumberUtil.sub(jsonStart.getString("vehicle_qty"),jsonTask.getString("vehicle_qty"))); - jsonStart.put("lock_type", "1"); - if (StrUtil.equals(jsonStart.getString("vehicle_qty"),"0")) { - jsonStart.put("point_status", "1"); - jsonStart.put("vehicle_type", ""); - } - pointTab.update(jsonStart); - } - } - } - - /** - * 虽然是养生A区，应该有二次申请，但是通过判断叠盘架是否有任务来判断做限制 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void findStartPoint() { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 - - JSONArray taskArr = taskTab.query("is_delete = '0' and handle_class = '" + this.THIS_CLASS + "' and task_status = '" + TaskStatusEnum.SURE_END.getCode() + "'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - // 创建任务 - JSONObject jsonTask = taskArr.getJSONObject(i); - String vehicle_type = jsonTask.getString("vehicle_type"); - - // 找叠盘架是否与对应的载具类型 - JSONObject jsonDpjStart = pointTab.query("region_id = '" + RegionTypeEnum.DPJQA.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty <> '0'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonDpjStart)) { - // 判断叠盘架是否有任务 有就下一个任务 - boolean is_point = this.isTask(jsonDpjStart.getString("point_code")); - if (!is_point) continue; - - // 判断叠盘架数量是否 < 需求数量 (暂时只能<需求数量) - if (jsonDpjStart.getIntValue("vehicle_qty") < jsonTask.getIntValue("vehicle_qty")) { - jsonTask.put("vehicle_qty", jsonDpjStart.getIntValue("vehicle_qty")); - } - - // 更新任务起点 - jsonTask.put("point_code1", jsonDpjStart.getString("point_code")); - jsonTask.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskTab.update(jsonTask); - - } else { - // 判断叠盘架载具数量是否是0 - JSONObject jsonDpjStart2 = pointTab.query("region_id = '" + RegionTypeEnum.DPJQA.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and vehicle_qty = '0'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonDpjStart2)) continue; - - // 判断叠盘架是否有任务 - boolean is_point = this.isTask(jsonDpjStart2.getString("point_code")); - if (!is_point) continue; - - // 找叠盘架暂存位是否有空托盘 - JSONObject map = new JSONObject(); - map.put("flag", "1"); - map.put("vehicle_type", vehicle_type); - - JSONObject jsonZcKtp = WQL.getWO("QSCH_YqxCallEmpVehicleTask").addParamMap(map).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonZcKtp)) { - // 创建任务：空载具暂存位 --> 叠盘架 - SchTaskDto dto = SchTaskDto.builder() - .task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .acs_task_type("2") - .task_name("暂存位>叠盘架空载具") - .task_status(TaskStatusEnum.START_AND_POINT.getCode()) - .point_code1(jsonZcKtp.getString("point_code")) - .point_code2(jsonDpjStart2.getString("point_code")) - .vehicle_code(jsonZcKtp.getString("vehicle_code")) - .vehicle_type(jsonZcKtp.getString("vehicle_type")) - .vehicle_qty(jsonZcKtp.getIntValue("vehicle_qty")) - .task_group_id(jsonTask.getLong("task_group_id")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - // 锁定起点 - jsonZcKtp.put("lock_type", "2"); - pointTab.update(jsonZcKtp); - } else { - // 空托盘暂存区没有就到养生A区找: 先找到出库等待点 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + - "' and row_num = '9' and can_vehicle_type = '" + vehicle_type + - "' and is_used = '1' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonEmpWait)) continue; - - JSONObject jsonStartPoint = pointTab.query("region_id = '" + jsonEmpWait.getString("region_id") + - "' and block_num = '" + jsonEmpWait.getString("block_num") + - "' and col_num = '" + jsonEmpWait.getString("col_num") + - "' and point_status = '2' and lock_type = '1' order by out_empty_seq DESC").uniqueResult(0); - if (ObjectUtil.isEmpty(jsonStartPoint)) continue; - - // 判断找到的空载具点位是否是等待点 - if (StrUtil.equals(jsonEmpWait.getString("point_code"), jsonStartPoint.getString("point_code"))) { - // 创建 养生A区空载具等待点 --> 叠盘架 - SchTaskDto dto = SchTaskDto.builder() - .task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .acs_task_type("2") - .task_name("养生A区>叠盘架空载具") - .task_status(TaskStatusEnum.START_AND_POINT.getCode()) - .point_code1(jsonStartPoint.getString("point_code")) - .point_code2(jsonDpjStart2.getString("point_code")) - .vehicle_code(jsonStartPoint.getString("vehicle_code")) - .vehicle_type(jsonStartPoint.getString("vehicle_type")) - .vehicle_qty(jsonStartPoint.getIntValue("vehicle_qty")) - .task_group_id(jsonTask.getLong("task_group_id")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - // 锁起点 - jsonStartPoint.put("lock_type", "2"); - pointTab.update(jsonStartPoint); - } else { - // 判断等待点是否是 未锁定 - if (StrUtil.equals(jsonEmpWait.getString("lock_type"), "1")) { - // 创建 养生A区空载具 --> 叠盘架 - SchTaskDto dto = SchTaskDto.builder() - .task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .acs_task_type("2") - .task_name("养生A区>叠盘架空载具") - .task_status(TaskStatusEnum.START_AND_POINT.getCode()) - .point_code1(jsonStartPoint.getString("point_code")) - .point_code2(jsonDpjStart2.getString("point_code")) - .vehicle_code(jsonStartPoint.getString("vehicle_code")) - .vehicle_type(jsonStartPoint.getString("vehicle_type")) - .vehicle_qty(jsonStartPoint.getIntValue("vehicle_qty")) - .task_group_id(jsonTask.getLong("task_group_id")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - // 锁起点 - jsonStartPoint.put("lock_type", "2"); - pointTab.update(jsonStartPoint); - // 锁等待点 - jsonEmpWait.put("lock_type", "2"); - pointTab.update(jsonEmpWait); - } else { - continue; - - } - } - } - } - } - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String createTask(JSONObject form) { - /* - * 1.先生成确定终点的任务 - * 2.通过findStartPoint()找起点 - * 3.下发给ACS - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); // 生产工单表 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); //点位基础表 - - //任务表【SCH_BASE_Task】 - //判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + form.getString("point_code2") + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + form.getString("point_code2") + "存在未完成的任务"); - - - - - String point_code2 = form.getString("point_code2"); - String sub_device_code = point_code2.substring(0, point_code2.indexOf("_")); - - String device_code = pointTab.query("point_code = '" + sub_device_code + "'").uniqueResult(0).getString("device_code"); - - JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); - if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); - - SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .task_name("油漆线叫空载具") - .task_status(TaskStatusEnum.SURE_END.getCode()) - .point_code2(point_code2) - .acs_task_type("2") - .vehicle_code(form.getString("vehicle_code")) - .vehicle_type(workOrderObj.getString("vehicle_type")) - .vehicle_qty(form.getIntValue("qty")) - .task_group_id(org.nl.wms.util.IdUtil.getLongId()) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void forceFinish(String task_id) { - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); - } - - - @Override - public void cancel(String task_id) { - - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList resultList = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - String point_code1 = json.getString("point_code1"); - //判断起点是否属于养生A区 - if (point_code1.startsWith("2")) { - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code1 = point_code1.substring(0, 4) + "1" + point_code1.substring(4, 9); - } - - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(point_code1) - .next_device_code(json.getString("point_code3")) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - resultList.add(dto); - } - return resultList; - } - - @Transactional(rollbackFor = Exception.class) - public boolean isTask(String point_code) { - /* - * 判断点位是否有任务存在 - */ - WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task"); - - boolean result; - - JSONObject jsonPointCode1 = tab.query("point_code1 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode2 = tab.query("point_code2 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode3 = tab.query("point_code3 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode4 = tab.query("point_code4 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonPointCode1) && ObjectUtil.isEmpty(jsonPointCode2) && ObjectUtil.isEmpty(jsonPointCode3) && ObjectUtil.isEmpty(jsonPointCode4)) { - result = true; - } else { - result = false; - } - - return result; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/wql/QSCH_GjxCallEmpVehicleTask.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/wql/QSCH_GjxCallEmpVehicleTask.wql deleted file mode 100644 index b76c2fb..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/wql/QSCH_GjxCallEmpVehicleTask.wql +++ /dev/null @@ -1,60 +0,0 @@ -[交易说明] - 交易名： 共挤线申请空盘 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - * - FROM - SCH_BASE_Point - WHERE - is_used = '1' - AND is_delete = '0' - AND lock_type = '1' - AND point_status = '2' - AND region_code = 'KTPHCQB01' - - OPTION 输入.vehicle_type <> "" - can_vehicle_type = 输入.vehicle_type - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/wql/QSCH_YqxCallEmpVehicleTask.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/wql/QSCH_YqxCallEmpVehicleTask.wql deleted file mode 100644 index 8163667..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/wql/QSCH_YqxCallEmpVehicleTask.wql +++ /dev/null @@ -1,60 +0,0 @@ -[交易说明] - 交易名： 油漆线申请空盘 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - * - FROM - SCH_BASE_Point - WHERE - is_used = '1' - AND is_delete = '0' - AND lock_type = '1' - AND point_status = '2' - AND region_code = 'KTPHCQA01' - - OPTION 输入.vehicle_type <> "" - can_vehicle_type = 输入.vehicle_type - ENDOPTION - - ENDSELECT - ENDQUERY - ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java deleted file mode 100644 index be830eb..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YqxCallMaterialTask.java +++ /dev/null @@ -1,258 +0,0 @@ -package org.nl.wms.sch.tasks.callMaterial; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.util.IdUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - - -/** - *油漆线叫料 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class YqxCallMaterialTask extends AbstractAcsTask { - private final String THIS_CLASS = YqxCallMaterialTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject task, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - String task_id = task.getString("task_id"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - // 物料点 - JSONObject material_point = pointTab.query("point_code = '" + taskObj.getString("point_code1") + "'").uniqueResult(0); - //任务取消 - if (StrUtil.equals(status, "0")) { - // 取消删除任务 - if (StrUtil.equals(taskObj.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - String point_code2 = taskObj.getString("point_code2"); - String point_code3 = taskObj.getString("point_code3"); - //说明未二次申请过 - if (ObjectUtil.isEmpty(point_code3)) { - JSONObject json = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - json.put("lock_type", "1"); - pointTab.update(json); - } - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("remark", "已取消"); - taskTab.update(taskObj); - - // 点位解锁 并设置空位 - material_point.put("lock_type", "1"); - material_point.put("point_status", "1"); - pointTab.update(material_point); - } - - if ("1".equals(status)) { - // 更新任务状态为执行中 - taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskObj.put("car_no", taskObj.getString("car_no")); - taskTab.update(taskObj); - } - - if (StrUtil.equals(status, "2")) { - // 更改任务状态为完成 - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - - JSONObject requestObj = task.getJSONObject("request_param"); - - //区域出入表【st_ivt_regionIO】 - WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO"); - JSONObject regionIoObj = new JSONObject(); - regionIoObj.put("iostorinv_id", IdUtil.getLongId()); - regionIoObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE")); - regionIoObj.put("buss_date", DateUtil.today()); - regionIoObj.put("io_type", "2"); - regionIoObj.put("region_id", material_point.getString("region_id")); - regionIoObj.put("region_code", material_point.getString("region_code")); - regionIoObj.put("region_name", material_point.getString("region_name")); - regionIoObj.put("material_id", taskObj.getString("material_id")); - regionIoObj.put("vehicle_code", taskObj.getString("vehicle_code")); - regionIoObj.put("qty", requestObj.getString("material_num")); - regionIoObj.put("bill_status", "3"); - regionIoObj.put("start_point_code", taskObj.getString("point_code1")); - regionIoObj.put("end_point_code", taskObj.getString("point_code2")); - regionIoObj.put("create_mode", "2"); - regionIoObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd")); - regionIoObj.put("create_id", SecurityUtils.getCurrentUserId()); - regionIoObj.put("create_name", SecurityUtils.getCurrentNickName()); - regionIoObj.put("create_time", DateUtil.now()); - regionIoTab.insert(regionIoObj); - - //完成后将仓位库存删掉 - //仓位库存表【ST_IVT_StructIvt】 - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); - ivtTab.delete("point_code = '" + taskObj.getString("point_code1") + "'"); - - // 点位解锁 并设置空位 - material_point.put("lock_type", "1"); - material_point.put("point_status", "1"); - pointTab.update(material_point); - } - - } - - @Override - public void findStartPoint() { - /* - * 根据业务找对应的起点 - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 - JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '" + TaskStatusEnum.SURE_END.getCode() + "'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - JSONObject taskObj = taskArr.getJSONObject(i); - String material_id = taskObj.getString("material_id"); - String vehicle_type = taskObj.getString("vehicle_type"); - JSONObject param1 = new JSONObject(); - param1.put("flag", "1"); - param1.put("material_id", material_id); - param1.put("region_code", "YSQA01"); - param1.put("vehicle_type", "%" + vehicle_type + "%"); - //1、根据物料id查找养生A区物料点 - JSONObject json1 = WQL.getWO("QSCH_yqxCallMAterial_01").addParamMap(param1).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(json1)) { - // 拿到点位 - JSONObject material_point = pointTab.query("point_id = '" + json1.getString("point_id") + "' and lock_type = '1'").uniqueResult(0); - if (ObjectUtil.isEmpty(material_point)) throw new BadRequestException("数据错误，请校验!"); - // 物料点位上锁 - material_point.put("lock_type", "2"); - pointTab.update(material_point); - - taskObj.put("point_code1", material_point.getString("point_code")); - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskObj.put("acs_task_type", "2"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } else { - taskObj.put("remark", "养生A区无所需物料"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } - - } - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList acsTaskArr = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - String point_code =json.getString("point_code1"); - String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); - - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(newPoint) - .next_device_code(json.getString("point_code3")) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - acsTaskArr.add(dto); - } - return acsTaskArr; - } - - @Override - public String createTask(JSONObject whereJson) { - String point_code2 = whereJson.getString("point_code2"); - String vehicle_type = whereJson.getString("vehicle_type"); - String vehicle_code = whereJson.getString("vehicle_code"); - String qty = whereJson.getString("material_num"); - - //生产工单表【PDM_BD_WorkOrder】 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); - //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - //判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code2 = '" + point_code2 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code2 + "存在未完成的任务"); - //点位基础表【SCH_BASE_Point】 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); - String device_code = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0).getString("device_code"); - JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); - if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); - - SchTaskDto dto = SchTaskDto.builder() - .task_id(IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("task_type") - .task_name("油漆线叫料") - .material_qty(qty) - .task_status(TaskStatusEnum.SURE_END.getCode()) - .point_code2(point_code2) - .vehicle_code(vehicle_code) - .material_info_id(workOrderObj.getLong("workorder_id")) - .material_id(workOrderObj.getLong("material_id")) - .vehicle_type(vehicle_type) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .request_param(whereJson.toJSONString()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - - //创建好立即下发 - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - @Override - public void forceFinish(String task_id) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) - this.updateTaskStatus(taskObj,"2"); - else { - throw new BadRequestException("未找到该任务或者任务已完成"); - } - } - - - @Override - public void cancel(String task_id) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) - this.updateTaskStatus(taskObj,"0"); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql deleted file mode 100644 index 16c4b37..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/wql/QSCH_yqxCallMAterial_01.wql +++ /dev/null @@ -1,71 +0,0 @@ -[交易说明] - 交易名： 共挤线满料请求 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_code TYPEAS s_string - 输入.material_id TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - IF 输入.flag = "1" - QUERY - SELECT - p.point_id, - p.point_code, - p.point_name, - p.block_num, - p.row_num, - p.col_num - FROM - ST_IVT_StructIvt ivt - LEFT JOIN SCH_BASE_Point p on ivt.point_id = p.point_id - WHERE - p.is_used = '1' - AND is_delete = '0' - AND lock_type='1' - OPTION 输入.material_id <> "" - ivt.material_id = 输入.material_id - ENDOPTION - OPTION 输入.region_code <> "" - p.region_code = 输入.region_code - ENDOPTION - OPTION 输入.vehicle_type <> "" - p.can_vehicle_type like 输入.vehicle_type - ENDOPTION - ORDER BY block_num,row_num desc,col_num - ENDSELECT - ENDQUERY - ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java deleted file mode 100644 index 99a4a40..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/CpOutTask.java +++ /dev/null @@ -1,235 +0,0 @@ -package org.nl.wms.sch.tasks.cpOut; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.util.IdUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - - -/** - *成品出库 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class CpOutTask extends AbstractAcsTask { - private final String THIS_CLASS = CpOutTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject task, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO"); - - String task_id = task.getString("task_id"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - //任务取消 - if (StrUtil.equals(status, "0")) { - // 取消删除任务 - if (StrUtil.equals(taskObj.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - String point_code2 = taskObj.getString("point_code2"); - JSONObject point2Obj = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("remark", "任务已取消"); - taskTab.update(taskObj); - // 释放终点点位 - point2Obj.put("lock_type", "1"); - point2Obj.put("point_status", "1"); - pointTab.update(point2Obj); - } - - if ("1".equals(status)) { - // 更新任务状态为执行中 - taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskObj.put("car_no", taskObj.getString("car_no")); - taskTab.update(taskObj); - } - - if (StrUtil.equals(status, "2")) { - // 更改任务状态为完成 - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - - // 任务表的点位1 - String point_code1 = taskObj.getString("point_code1"); // 起点编码 - JSONObject point1Obj = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0);// 起点 - - //table_fk_id = 单据id - JSONObject regionIoObject = regionIoTab.query("iostorinv_id = '" + taskObj.getString("table_fk_id") + "'").uniqueResult(0); - - String point_code2 = taskObj.getString("point_code2"); // 终点编码：出库点位 - JSONObject point2Obj = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0);// 终点 - - // 修改区域出入库 - 起点点位解锁、点位状态更新 - 终点解锁、更新状态 - //区域出入表【st_ivt_regionIO】 - regionIoObject.put("end_point_code", point_code2); - regionIoObject.put("start_region_id", point1Obj.getString("region_id")); // 终点区域 - regionIoObject.put("end_region_id", point2Obj.getString("region_id")); // 终点区域 - regionIoObject.put("bill_status", "3"); // 单据状态 - regionIoObject.put("task_id", task_id); // 任务id - regionIoTab.update(regionIoObject); - - //完成后将仓位库存删掉 - //仓位库存表【ST_IVT_StructIvt】 - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); - ivtTab.delete("point_code = '" + taskObj.getString("point_code1") + "'"); - - // 点位解锁 并设置空位 - point1Obj.put("lock_type", "1"); - point1Obj.put("point_status", "1"); - point2Obj.put("lock_type", "1"); - point2Obj.put("point_status", "3"); - pointTab.update(point1Obj); - pointTab.update(point2Obj); - } - - } - - @Override - public void findNextPoint() { - /* - * 根据业务找对应的终点 - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); // 点位表 - JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '" + TaskStatusEnum.SURE_END.getCode() + "'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - JSONObject taskObj = taskArr.getJSONObject(i); - String material_id = taskObj.getString("material_id"); - JSONObject param1 = new JSONObject(); - param1.put("flag", "1"); - param1.put("material_id", material_id); - param1.put("region_code", "CPCKQ01"); - //1、找空位的终点 - JSONObject endPoint = WQL.getWO("QSCH_cpOut_01").addParamMap(param1).process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(endPoint)) { - // 找到终点，上锁 - taskObj.put("update_time", DateUtil.now()); - taskObj.put("point_code2", endPoint.getString("point_code")); - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskTab.update(taskObj); - - //锁住终点 - endPoint.put("task_id", taskObj.getString("task_id")); - endPoint.put("lock_type", "2"); - pointTab.update(endPoint); - } else { - taskObj.put("remark", "成品出库区无可用货位"); - taskObj.put("update_time", DateUtil.now()); - } - - taskTab.update(taskObj); - - } - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList acsTaskArr = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - acsTaskArr.add(dto); - } - return acsTaskArr; - } - - @Override - public String createTask(JSONObject whereJson) { - WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO"); - String point_code1 = whereJson.getString("point_code1"); // 起点 - String vehicle_type = whereJson.getString("vehicle_type"); - String vehicle_code = whereJson.getString("vehicle_code"); - String iostorinv_id = whereJson.getString("iostorinv_id"); - - SchTaskDto dto = SchTaskDto.builder() - .task_id(IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("task_type") - .task_name("成品区出库") - .task_status(TaskStatusEnum.SURE_END.getCode()) - .point_code1(point_code1) - .vehicle_code(vehicle_code) - .vehicle_type(vehicle_type) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .request_param(whereJson.toJSONString()) - .table_name("st_ivt_regionIO") - .table_fk("iostorinv_id") - .table_fk_id(Long.valueOf(iostorinv_id)) - .build(); - //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - - // 单据设置执行中 - JSONObject iostorinv = regionIoTab.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0); - iostorinv.put("bill_status", "2"); - regionIoTab.update(iostorinv); - - //创建好立即下发 - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - @Override - public void forceFinish(String task_id) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) - this.updateTaskStatus(taskObj,"2"); - else { - throw new BadRequestException("未找到该任务或者任务已完成"); - } - } - - @Override - public void cancel(String task_id) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) - this.updateTaskStatus(taskObj,"0"); - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/wql/QSCH_cpOut_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/wql/QSCH_cpOut_01.wql deleted file mode 100644 index 7546033..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/cpOut/wql/QSCH_cpOut_01.wql +++ /dev/null @@ -1,59 +0,0 @@ -[交易说明] - 交易名： 成品出库 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_code TYPEAS s_string - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - * - FROM - SCH_BASE_Point - WHERE - is_used = '1' - AND is_delete = '0' - AND lock_type = '1' - AND is_used = '1' - AND point_status = '1' - OPTION 输入.region_code <> "" - region_code = 输入.region_code - ENDOPTION - ORDER BY point_code - ENDSELECT - ENDQUERY - ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java deleted file mode 100644 index a5bf266..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/HtSendEmpVehicleTask.java +++ /dev/null @@ -1,438 +0,0 @@ -package org.nl.wms.sch.tasks.sendEmpty; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.sch.tasks.RegionTypeEnum; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -/** - * 一楼往二楼送空托盘业务 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class HtSendEmpVehicleTask extends AbstractAcsTask { - private final String THIS_CLASS = HtSendEmpVehicleTask.class.getName(); - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject taskObj, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - String task_id = taskObj.getString("task_id"); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - if (StrUtil.equals(status, "0")) { - // 取消删除任务 - if (StrUtil.equals(jsonTask.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - String point_code3 = jsonTask.getString("point_code3"); - String point_code2 = jsonTask.getString("point_code2"); - if (ObjectUtil.isNotEmpty(point_code3)) { - JSONObject jsonPoint3 = pointTab.query("point_code ='" + point_code3 + "'").uniqueResult(0); - jsonPoint3.put("point_status", "1"); - pointTab.update(jsonPoint3); - } - if (ObjectUtil.isNotEmpty(point_code2)) { - JSONObject jsonPoint2 = pointTab.query("point_code ='" + point_code2 + "'").uniqueResult(0); - jsonPoint2.put("point_status", "1"); - pointTab.update(jsonPoint2); - } - taskTab.delete("task_id = '" + task_id + "'"); - } - - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { - // 更新任务状态为执行中 - jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", taskObj.getString("car_no")); - taskTab.update(jsonTask); - } - - if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { - // 更改任务状态为完成 - jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("update_time", DateUtil.now()); - taskTab.update(jsonTask); - - String point_code3 = jsonTask.getString("point_code3"); - String point_code = ""; - // 更新终点：判断point_code3是否为空，为空就更新point_code2 - if (ObjectUtil.isNotEmpty(point_code3)) { - point_code = point_code3; - // 更新point_code2:解锁 - JSONObject point2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0); - point2.put("lock_type", "1"); - point2.put("vehicle_type", ""); - point2.put("vehicle_code", ""); - point2.put("vehicle_qty", 0); - pointTab.update(point2); - } else { - point_code = jsonTask.getString("point_code2"); - } - - JSONObject endPoint = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0); - - //终点是叠盘架 - if (StrUtil.equals(endPoint.getString("region_id"), RegionTypeEnum.DPJQA.getId())) { - Integer vehicle_qty = endPoint.getInteger("vehicle_qty"); - vehicle_qty += jsonTask.getInteger("vehicle_qty"); - endPoint.put("lock_type", "1"); - endPoint.put("vehicle_qty", vehicle_qty); - endPoint.put("point_status", "1"); - endPoint.put("vehicle_type", jsonTask.getString("vehicle_type")); - pointTab.update(endPoint); - } else {//非叠盘架 - endPoint.put("lock_type", "1"); - endPoint.put("vehicle_code", jsonTask.getString("vehicle_code")); - endPoint.put("vehicle_qty", jsonTask.getString("vehicle_qty")); - endPoint.put("vehicle_type", jsonTask.getString("vehicle_type")); - endPoint.put("point_status", "2"); - pointTab.update(endPoint); - } - } - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public String createTask(JSONObject form) { - /* - * 1.先生成确定起点的任务 - * 2.通过findNextPoint()找终点 - * 3.下发给ACS - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - - String point_code1 = form.getString("point_code1"); - - SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .task_name("电梯送空载具") - .task_status(TaskStatusEnum.SURE_START.getCode()) - .point_code1(point_code1) - .vehicle_code(form.getString("vehicle_code")) - .vehicle_type(form.getString("vehicle_type")) - .vehicle_qty(form.getIntValue("qty")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - this.findNextPoint(); -// this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - @Override - public void findNextPoint() { - /* - * 根据业务找对应的终点 - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - JSONObject jsonTask = taskArr.getJSONObject(i); - String point_code_ht = ""; - - //判断SSX01A1是否有任务没有则判断其他的三个点位 - boolean ssx_1 = this.isTask("SSX01A1"); - if (ssx_1) { - String like = "SSX01%"; - - JSONArray taskArrNum = new JSONArray(); - JSONArray pointArr = pointTab.query("region_id = '" + RegionTypeEnum.SSX.getId() + "' and is_used = '1' and is_delete = '0' and point_code like '" + like + "'").getResultJSONArray(0); - - for (int j = 0; j < pointArr.size(); j++) { - JSONObject json = pointArr.getJSONObject(j); - boolean is_empTask = this.isTask(json.getString("point_code")); - - if (!is_empTask) taskArrNum.add(json); - } - - if (taskArrNum.size() > 0) { - - } else { - point_code_ht = "SSX01A1"; - } - } - - // 判断SSX02A1是否有任务没有则判断其他的三个点位 - if (ObjectUtil.isEmpty(point_code_ht)) { - boolean ssx_2 = this.isTask("SSX02A1"); - if (ssx_2) { - String like = "SSX02%"; - - JSONArray taskArrNum = new JSONArray(); - JSONArray pointArr = pointTab.query("region_id = '" + RegionTypeEnum.SSX.getId() + "' and is_used = '1' and is_delete = '0' and point_code like '" + like + "'").getResultJSONArray(0); - - for (int k = 0; k < pointArr.size(); k++) { - JSONObject json = pointArr.getJSONObject(k); - boolean is_empTask = this.isTask(json.getString("point_code")); - - if (!is_empTask) taskArrNum.add(json); - } - - if (taskArrNum.size() > 0) { - - } else { - point_code_ht = "SSX02A1"; - } - } - } - - // 如果此时point_code_ht为空则循环下一个任务 - if (ObjectUtil.isEmpty(point_code_ht)) { - continue; - } - - // 说明货梯无任务：找终点 - JSONObject param = new JSONObject(); - param.put("vehicle_type", jsonTask.getString("vehicle_type")); - param.put("qty", jsonTask.getString("vehicle_qty")); - String endPoint = this.endPoint(param); - - // 如果此时endPoint为空则循环下一个任务 - if (ObjectUtil.isEmpty(endPoint)) { - continue; - } - - // 更新任务表point_code2 - jsonTask.put("point_code2", endPoint); - jsonTask.put("task_status", "4"); - taskTab.update(jsonTask); - - // 锁定终点 - JSONObject jsonEnd = pointTab.query("point_code = '" + endPoint + "'").uniqueResult(0); - jsonEnd.put("lock_type", "2"); - pointTab.update(jsonEnd); - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void forceFinish(String task_id) { - /* - * 强制完成 - */ - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); - } - - @Override - public void cancel(String task_id) { - - } - - @Transactional(rollbackFor = Exception.class) - public String endPoint(JSONObject param) { - /* - * 1.叠盘架有A对应货位 规则：如果暂存位能放下则放暂存位如果放不下则走2或3 - * 2.叠盘架A没有货位 则去叠盘架暂存位 - * 3.叠盘架暂存位没有货位则去养生A区 - */ - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表 - - String end_code = ""; - - String vehicle_type = param.getString("vehicle_type"); - - // 1.找到对应类型的叠盘架 - JSONObject jsonDpjEnd = pointTab.query("region_id = '" + RegionTypeEnum.DPJQA.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDpjEnd)) { - // 判断数量 + 叠盘架的数量是否超过此叠盘架的最大数量 - double add_num = NumberUtil.add(param.getIntValue("qty"), jsonDpjEnd.getIntValue("vehicle_qty")); - - if (jsonDpjEnd.getDoubleValue("vehicle_max_qty") >= add_num) { - end_code = jsonDpjEnd.getString("point_code"); - } else { - // 如果数量大于此叠盘架最大数量则查找叠盘架缓存位是否有对应空位 - JSONObject jsonZcwEnd = pointTab.query("region_id = '" + RegionTypeEnum.KTPHCQA.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonZcwEnd)) { - end_code = jsonZcwEnd.getString("point_code"); - } else { - // 为空就去养生A区的等待位 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpWait)) { - // 判断是否有任务 - boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); - if (is_point) { - JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); - } - } - } - } - } else { - // 2.叠盘架没有空位去找叠盘暂存位 - JSONObject jsonZcwEnd = pointTab.query("region_id = '" + RegionTypeEnum.KTPHCQA.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonZcwEnd)) { - end_code = jsonZcwEnd.getString("point_code"); - } else { - // 为空就去养生A区的等待位 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpWait)) { - // 判断是否有任务 - boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); - if (is_point) { - JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); - } - } - } - } - - return end_code; - } - - @Transactional(rollbackFor = Exception.class) - public boolean isTask(String point_code) { - /* - * 判断点位是否有任务存在 - */ - WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task"); - - boolean result; - - JSONObject jsonPointCode1 = tab.query("point_code1 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode2 = tab.query("point_code2 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode3 = tab.query("point_code3 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode4 = tab.query("point_code4 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonPointCode1) && ObjectUtil.isEmpty(jsonPointCode2) && ObjectUtil.isEmpty(jsonPointCode3) && ObjectUtil.isEmpty(jsonPointCode4)) { - result = true; - } else { - result = false; - } - - return result; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String againApply(String task_id) { - /* - * 再次下发任务处理方法 - * 涉及业务：入空载具、出空载具、入物料、出物料 - */ - - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表 - - String point_code = ""; - - JSONObject jsonTask = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0); - JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0); - - // 根据 区域、块、列找到第一个有物料的货位 - JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + - "' and block_num = '" + jsonPoint2.getString("block_num") + - "' and col_num = '" + jsonPoint2.getString("col_num") + - "' and point_code <> '" + jsonPoint2.getString("point_code") + - "' and point_status = '2' and lock_type = '1' order by in_empty_seq ASC").uniqueResult(0); - - // 如果为空说明这一列其他货位为空 则入到最后一个货位 - if (ObjectUtil.isEmpty(jsonOnePoint)) { - JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + - "' and block_num = '" + jsonPoint2.getString("block_num") + - "' and col_num = '" + jsonPoint2.getString("col_num") + - "' and point_code <> '" + jsonPoint2.getString("point_code") + - "' and point_status = '1' and lock_type = '1' order by in_empty_seq DESC").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpPoint)) { - point_code = jsonEmpPoint.getString("point_code"); - jsonTask.put("point_code3", point_code); - taskTab.update(jsonTask); - } - } else { - // 找前一位的空位 - double in_empty_seq = NumberUtil.sub(jsonOnePoint.getIntValue("in_empty_seq"), 1); - - JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + - "' and block_num = '" + jsonPoint2.getString("block_num") + - "' and col_num = '" + jsonPoint2.getString("col_num") + - "' and point_code <> '" + jsonPoint2.getString("point_code") + - "' and in_empty_seq = '" + in_empty_seq + - "' and point_status = '1' and lock_type = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpPoint)) { - point_code = jsonEmpPoint.getString("point_code"); - jsonTask.put("point_code3", point_code); - taskTab.update(jsonTask); - } - } - - if (ObjectUtil.isNotEmpty(point_code)) { - JSONObject jsonEndPoint = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0); - jsonEndPoint.put("lock_type", "2"); - pointTab.update(jsonEndPoint); - } - //判断点位是否属于养生A区 - if (point_code.startsWith("2")) { - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); - } - return point_code; - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList resultList = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - - String point_code3=json.getString("point_code3"); - //判断终点是否属于养生A区 - if (point_code3.startsWith("2")) { - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9); - } - - - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(point_code3) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - resultList.add(dto); - } - return resultList; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java deleted file mode 100644 index 4177b9b..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendEmpty/YqxSendEmpVehicleTask.java +++ /dev/null @@ -1,391 +0,0 @@ -package org.nl.wms.sch.tasks.sendEmpty; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.sch.tasks.RegionTypeEnum; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -@Service -@RequiredArgsConstructor -@Slf4j -public class YqxSendEmpVehicleTask extends AbstractAcsTask { - private final String THIS_CLASS = YqxSendEmpVehicleTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject taskObj, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - String task_id = taskObj.getString("task_id"); - JSONObject jsonTask = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - if (StrUtil.equals(status, "0")) { - // 取消删除任务 - if (StrUtil.equals(jsonTask.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - String point_code3 = jsonTask.getString("point_code3"); - String point_code2 = jsonTask.getString("point_code2"); - if (ObjectUtil.isNotEmpty(point_code3)) { - JSONObject jsonPoint3 = pointTab.query("point_code ='" + point_code3 + "'").uniqueResult(0); - jsonPoint3.put("point_status", "1"); - pointTab.update(jsonPoint3); - } - if (ObjectUtil.isNotEmpty(point_code2)) { - JSONObject jsonPoint2 = pointTab.query("point_code ='" + point_code2 + "'").uniqueResult(0); - jsonPoint2.put("point_status", "1"); - pointTab.update(jsonPoint2); - } - taskTab.delete("task_id = '" + task_id + "'"); - } - - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { - // 更新任务状态为执行中 - jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", taskObj.getString("car_no")); - taskTab.update(jsonTask); - } - - if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { - // 更改任务状态为完成 - jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("update_time", DateUtil.now()); - taskTab.update(jsonTask); - - String point_code3 = jsonTask.getString("point_code3"); - String point_code = ""; - // 更新终点：判断point_code3是否为空，为空就更新point_code2 - if (ObjectUtil.isNotEmpty(point_code3)) { - point_code = point_code3; - // 更新point_code2:解锁 - JSONObject point2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0); - point2.put("lock_type", "1"); - point2.put("vehicle_type", ""); - point2.put("vehicle_code", ""); - point2.put("vehicle_qty", 0); - pointTab.update(point2); - } else { - point_code = jsonTask.getString("point_code2"); - } - - JSONObject endPoint = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0); - - //终点是叠盘架 - if (StrUtil.equals(endPoint.getString("region_id"), RegionTypeEnum.DPJQB.getId())) { - Integer vehicle_qty = endPoint.getInteger("vehicle_qty"); - vehicle_qty += jsonTask.getInteger("vehicle_qty"); - endPoint.put("lock_type", "1"); - endPoint.put("vehicle_qty", vehicle_qty); - endPoint.put("point_status", "1"); - endPoint.put("vehicle_type", jsonTask.getString("vehicle_type")); - pointTab.update(endPoint); - } else {//非叠盘架 - endPoint.put("lock_type", "1"); - endPoint.put("vehicle_code", jsonTask.getString("vehicle_code")); - endPoint.put("vehicle_qty", jsonTask.getString("vehicle_qty")); - endPoint.put("vehicle_type", jsonTask.getString("vehicle_type")); - endPoint.put("point_status", "2"); - pointTab.update(endPoint); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String createTask(JSONObject form) { - /* - * 1.先生成确定起点的任务 - * 2.通过findNextPoint()找终点 - * 3.下发给ACS - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - - String point_code1 = form.getString("point_code1"); - - SchTaskDto dto = SchTaskDto.builder().task_id(org.nl.wms.util.IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("") - .task_status(TaskStatusEnum.SURE_START.getCode()) - .point_code1(point_code1) - .vehicle_code(form.getString("vehicle_code")) - .vehicle_type(form.getString("vehicle_type")) - .vehicle_qty(form.getIntValue("qty")) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); -// this.findNextPoint(); - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - /** - * @return - * @discription 确定下一点位 - * @author ldjun - * @created 2020年6月12日 下午6:01:06 - */ - @Override - public void findNextPoint() { - /* - * 根据业务找对应的终点 - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - JSONObject jsonTask = taskArr.getJSONObject(i); - - // 找终点 - JSONObject param = new JSONObject(); - param.put("vehicle_type", jsonTask.getString("vehicle_type")); - param.put("qty", jsonTask.getString("vehicle_qty")); - String endPoint = this.endPoint(param); - - // 如果此时endPoint为空则循环下一个任务 - if (ObjectUtil.isEmpty(endPoint)) { - continue; - } - - // 更新任务表point_code2 - jsonTask.put("point_code2", endPoint); - jsonTask.put("task_status", "4"); - taskTab.update(jsonTask); - - // 锁定终点 - JSONObject jsonEnd = pointTab.query("point_code = '" + endPoint + "'").uniqueResult(0); - jsonEnd.put("lock_type", "2"); - pointTab.update(jsonEnd); - } - - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void forceFinish(String task_id) { - /* - * 强制完成 - */ - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); - } - - - @Override - public void cancel(String task_id) { - - } - - @Transactional(rollbackFor = Exception.class) - public String endPoint(JSONObject param) { - /* - * 1.叠盘架有B对应货位 规则：如果暂存位能放下则放暂存位如果放不下则走2或3 - * 2.叠盘架B没有货位 则去叠盘架暂存位 - * 3.叠盘架暂存位没有货位则去养生A区 - */ - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表 - - String end_code = ""; - - String vehicle_type = param.getString("vehicle_type"); - - // 1.找到对应类型的叠盘架 - JSONObject jsonDpjEnd = pointTab.query("region_id = '" + RegionTypeEnum.DPJQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonDpjEnd)) { - // 判断数量 + 叠盘架的数量是否超过此叠盘架的最大数量 - double add_num = NumberUtil.add(param.getIntValue("qty"), jsonDpjEnd.getIntValue("vehicle_qty")); - - if (jsonDpjEnd.getDoubleValue("vehicle_max_qty") >= add_num) { - end_code = jsonDpjEnd.getString("point_code"); - } else { - // 如果数量大于此叠盘架最大数量则查找叠盘架缓存位是否有对应空位 - JSONObject jsonZcwEnd = pointTab.query("region_id = '" + RegionTypeEnum.KTPHCQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonZcwEnd)) { - end_code = jsonZcwEnd.getString("point_code"); - } else { - // 为空就去养生A区的等待位 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpWait)) { - // 判断是否有任务 - boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); - if (is_point) { - JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); - } - } - } - } - } else { - // 2.叠盘架没有空位去找叠盘暂存位 - JSONObject jsonZcwEnd = pointTab.query("region_id = '" + RegionTypeEnum.KTPHCQB.getId() + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonZcwEnd)) { - end_code = jsonZcwEnd.getString("point_code"); - } else { - // 为空就去养生A区的等待位 - JSONObject jsonEmpWait = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and row_num = '1' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpWait)) { - // 判断是否有任务 - boolean is_point = this.isTask(jsonEmpWait.getString("point_code")); - if (is_point) { - JSONArray jsonEmpArr = pointTab.query("region_id = '" + RegionTypeEnum.YSAQKTPQ01.getId() + "' and col_num = '" + jsonEmpWait.getString("col_num") + "' and can_vehicle_type = '" + vehicle_type + "' and lock_type = '1' and is_used = '1' and is_delete = '0' and point_status = '1'").getResultJSONArray(0); - if (ObjectUtil.isNotEmpty(jsonEmpArr)) end_code = jsonEmpWait.getString("point_code"); - } - } - } - } - - return end_code; - } - - @Transactional(rollbackFor = Exception.class) - public boolean isTask(String point_code) { - /* - * 判断点位是否有任务存在 - */ - WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task"); - - boolean result; - - JSONObject jsonPointCode1 = tab.query("point_code1 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode2 = tab.query("point_code2 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode3 = tab.query("point_code3 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - JSONObject jsonPointCode4 = tab.query("point_code4 = '" + point_code + "' and task_status <> '7' and is_delete = '0'").uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonPointCode1) && ObjectUtil.isEmpty(jsonPointCode2) && ObjectUtil.isEmpty(jsonPointCode3) && ObjectUtil.isEmpty(jsonPointCode4)) { - result = true; - } else { - result = false; - } - - return result; - } - - @Transactional(rollbackFor = Exception.class) - @Override - public String againApply(String task_id) { - /* - * 再次下发任务处理方法 - * 涉及业务：入空载具、出空载具、入物料、出物料 - */ - - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表 - - String point_code = ""; - - JSONObject jsonTask = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0); - JSONObject jsonPoint2 = pointTab.query("point_code = '" + jsonTask.getString("point_code2") + "'").uniqueResult(0); - - // 根据 区域、块、列找到第一个有物料的货位 - JSONObject jsonOnePoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + - "' and block_num = '" + jsonPoint2.getString("block_num") + - "' and col_num = '" + jsonPoint2.getString("col_num") + - "' and point_code <> '" + jsonPoint2.getString("point_code") + - "' and point_status = '2' and lock_type = '1' order by in_empty_seq ASC").uniqueResult(0); - - // 如果为空说明这一列其他货位为空 则入到最后一个货位 - if (ObjectUtil.isEmpty(jsonOnePoint)) { - JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + - "' and block_num = '" + jsonPoint2.getString("block_num") + - "' and col_num = '" + jsonPoint2.getString("col_num") + - "' and point_code <> '" + jsonPoint2.getString("point_code") + - "' and point_status = '1' and lock_type = '1' order by in_empty_seq DESC").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpPoint)) { - point_code = jsonEmpPoint.getString("point_code"); - jsonTask.put("point_code3", point_code); - taskTab.update(jsonTask); - } - } else { - // 找前一位的空位 - double in_empty_seq = NumberUtil.sub(jsonOnePoint.getIntValue("in_empty_seq"), 1); - - JSONObject jsonEmpPoint = pointTab.query("region_id = '" + jsonPoint2.getString("region_id") + - "' and block_num = '" + jsonPoint2.getString("block_num") + - "' and col_num = '" + jsonPoint2.getString("col_num") + - "' and point_code <> '" + jsonPoint2.getString("point_code") + - "' and in_empty_seq = '" + in_empty_seq + - "' and point_status = '1' and lock_type = '1'").uniqueResult(0); - - if (ObjectUtil.isNotEmpty(jsonEmpPoint)) { - point_code = jsonEmpPoint.getString("point_code"); - jsonTask.put("point_code3", point_code); - taskTab.update(jsonTask); - } - } - - if (ObjectUtil.isNotEmpty(point_code)) { - JSONObject jsonEndPoint = pointTab.query("point_code = '" + point_code + "'").uniqueResult(0); - jsonEndPoint.put("lock_type", "2"); - pointTab.update(jsonEndPoint); - } - //判断点位是否属于养生A区 - if (point_code.startsWith("2")) { - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); - } - return point_code; - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList resultList = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - String point_code3 = json.getString("point_code3"); - //判断终点是否属于养生A区 - if (point_code3.startsWith("2")) { - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - point_code3 = point_code3.substring(0, 4) + "1" + point_code3.substring(4, 9); - } - - - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(point_code3) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - resultList.add(dto); - } - return resultList; - } - - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java deleted file mode 100644 index b9290ca..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java +++ /dev/null @@ -1,384 +0,0 @@ -package org.nl.wms.sch.tasks.sendMaterial; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.util.IdUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - - -/** - * 共挤线送料任务服务 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class GjxSendMaterialTask extends AbstractAcsTask { - private final String THIS_CLASS = GjxSendMaterialTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject task, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - String task_id = task.getString("task_id"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - //任务取消 - if (StrUtil.equals(status, "0")) { - // 取消删除任务 - if (StrUtil.equals(taskObj.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("remark", "已取消"); - taskTab.update(taskObj); - - //释放相关电位信息 - JSONObject param1 = new JSONObject(); - param1.put("lock_type", "1"); - param1.put("task_id", ""); - param1.put("material_id", ""); - pointTab.update(param1, "task_id = '" + taskObj.getString("task_id") + "'"); - } - - if ("1".equals(status)) { - // 更新任务状态为执行中 - taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskObj.put("car_no", taskObj.getString("car_no")); - taskTab.update(taskObj); - } - - if (StrUtil.equals(status, "2")) { - - //判断状态, - if (StrUtil.equals("2", taskObj.getString("task_status"))) { - // 更改任务状态为完成 - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - return; - } - // 更改任务状态为完成 - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - - - String point_code2 = taskObj.getString("point_code2"); - JSONObject endPoint = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - JSONObject requestObj = task.getJSONObject("request_param"); - //工单标识 - String workorder_id = requestObj.getString("material_info_id"); - //生产工单表【PDM_BD_WorkOrder】 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); - JSONObject workorderObj = workOrderTab.query("workorder_id", workorder_id).uniqueResult(0); - - - //区域出入表【st_ivt_regionIO】 - WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO"); - JSONObject regionIoObj = new JSONObject(); - regionIoObj.put("iostorinv_id", IdUtil.getLongId()); - regionIoObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE")); - regionIoObj.put("buss_date", DateUtil.today()); - regionIoObj.put("io_type", "1"); - regionIoObj.put("region_id", endPoint.getString("region_id")); - regionIoObj.put("region_code", endPoint.getString("region_code")); - regionIoObj.put("region_name", endPoint.getString("region_name")); - regionIoObj.put("material_id", taskObj.getString("material_id")); - regionIoObj.put("vehicle_code", taskObj.getString("vehicle_code")); - regionIoObj.put("qty", requestObj.getString("qty")); - regionIoObj.put("bill_status", "3"); - regionIoObj.put("start_point_code", taskObj.getString("point_code1")); - regionIoObj.put("end_point_code", taskObj.getString("point_code3")); - regionIoObj.put("create_mode", "2"); - regionIoObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd")); - regionIoObj.put("create_id", SecurityUtils.getCurrentUserId()); - regionIoObj.put("create_name", SecurityUtils.getCurrentNickName()); - regionIoObj.put("create_time", DateUtil.now()); - regionIoTab.insert(regionIoObj); - - - //完成后入库 - //仓位库存表【ST_IVT_StructIvt】 - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); - JSONObject ivtObj = new JSONObject(); - ivtObj.put("stockrecord_id", IdUtil.getLongId()); - ivtObj.put("point_id", endPoint.getString("point_id")); - ivtObj.put("point_code", endPoint.getString("point_code")); - ivtObj.put("point_name", endPoint.getString("point_name")); - ivtObj.put("region_id", endPoint.getString("region_id")); - ivtObj.put("region_code", endPoint.getString("region_code")); - ivtObj.put("region_name", endPoint.getString("region_name")); - ivtObj.put("instorage_time", DateUtil.now()); - ivtObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd")); - ivtObj.put("ivt_qty", requestObj.getString("qty")); - ivtObj.put("standing_time", workorderObj.getString("standing_time")); - ivtObj.put("material_id", workorderObj.getString("material_id")); - ivtTab.insert(ivtObj); - - // 点位解锁 - endPoint.put("lock_type", "1"); - endPoint.put("point_status", "3"); - endPoint.put("material_id", taskObj.getString("material_id")); - pointTab.update(endPoint); - //释放整列货位 - JSONObject param = new JSONObject(); - param.put("lock_type", "1"); - pointTab.update(param, "task_id = '" + task_id + "'"); - - } - - } - - @Override - public void findNextPoint() { - //判断共挤线是否有执行中的任务，如果任务数>=3,则不生成任务 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - /* - * 根据业务找对应的终点 - */ - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - JSONObject taskObj = taskArr.getJSONObject(i); - String material_id = taskObj.getString("material_id"); - String vehicle_type = taskObj.getString("vehicle_type"); - JSONObject param1 = new JSONObject(); - param1.put("flag", "1"); - param1.put("material_id", material_id); - param1.put("region_code", "YSQA01"); - param1.put("vehicle_type", "%" + vehicle_type + "%"); - //1、查找库区类是否有响应的载具类型和对应的物料 - JSONObject json1 = WQL.getWO("QSCH_gjxSendMaterial_01").addParamMap(param1).process().uniqueResult(0); - - - //判断是否有到同一列的相同物料SKU的AGV任务，如果有，则等待 - JSONArray taskIngs = taskTab.query("is_delete='0' and material_id = '" + material_id + "' and (task_status = '4' or task_status = '5' or task_status = '6' )").getResultJSONArray(0); - - if (ObjectUtil.isNotEmpty(taskIngs)) { - JSONObject taskIng = taskIngs.getJSONObject(0); - if (ObjectUtil.isNotEmpty(taskIng) && ObjectUtil.isNotEmpty(json1)) { - JSONObject point2 = pointTab.query("point_code = '" + taskIng.getString("point_code2") + "'").uniqueResult(0); - if (StrUtil.equals(point2.getString("block_num"), json1.getString("block_num")) - && StrUtil.equals(point2.getString("col_num"), json1.getString("col_num"))) { - taskObj.put("remark", "相应列有AGV在工作,等待执行!"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } - } - } - - - if (ObjectUtil.isNotEmpty(json1)) { - Integer block_num = json1.getInteger("block_num"); - Integer row_num = json1.getInteger("row_num"); - Integer col_num = json1.getInteger("col_num"); - - JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='" + (row_num - 1) + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); - taskObj.put("point_code2", firstRow.getString("point_code")); - taskObj.put("update_time", DateUtil.now()); - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - //二楼普通任务 - taskTab.update(taskObj); - //锁住相关货位 - JSONObject point = new JSONObject(); - point.put("lock_type", "2"); - point.put("task_id", taskObj.getString("task_id")); - pointTab.update(point, "block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num <= '" + (row_num - 1) + "'"); - - } else {//找空位入 - if (ObjectUtil.isNotEmpty(taskIngs) && taskIngs.size() > 1) { - taskObj.put("remark", "相应列有AGV在工作,等待执行!"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - continue; - } - - JSONObject param2 = new JSONObject(); - param2.put("flag", "2"); - param2.put("region_code", "YSQA01"); - param2.put("vehicle_type", "%" + vehicle_type + "%"); - //1、查找整列为空的货位 - JSONObject json2 = WQL.getWO("QSCH_gjxSendMaterial_01").addParamMap(param2).process().uniqueResult(0); - if (ObjectUtil.isEmpty(json2)) { - taskObj.put("remark", "养生A区无可用货位"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } else { - Integer block_num = json2.getInteger("block_num"); - Integer col_num = json2.getInteger("col_num"); - JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num ='9'").uniqueResult(0); - taskObj.put("point_code2", firstRow.getString("point_code")); - //二楼普通任务 - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - //锁住相关货位 - JSONObject point = new JSONObject(); - point.put("lock_type", "2"); - point.put("task_id", taskObj.getString("task_id")); - pointTab.update(point, "block_num = '" + block_num + "' and col_num = '" + col_num + "' and row_num <= '" + 9 + "'"); - - } - } - - } - } - - @Override - public List addTask() { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - /* - * 下发给ACS时需要特殊处理 - */ - JSONArray arr = taskTab.query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0); - - ArrayList acsTaskArr = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - String point_code = json.getString("point_code2"); - String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); - - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(newPoint) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - acsTaskArr.add(dto); - } - return acsTaskArr; - } - - @Override - public String createTask(JSONObject whereJson) { - String point_code1 = whereJson.getString("point_code1"); - String vehicle_type = whereJson.getString("vehicle_type"); - String vehicle_code = whereJson.getString("vehicle_code"); - String qty = whereJson.getString("qty"); - - //生产工单表【PDM_BD_WorkOrder】 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); - //点位基础表【SCH_BASE_Point】 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); - - //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - //判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务"); - - String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code"); - - - JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); - if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); - - - SchTaskDto dto = SchTaskDto.builder() - .task_id(IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("task_type") - .task_name("共挤线满料") - .task_status(TaskStatusEnum.SURE_START.getCode()) - .point_code1(point_code1) - .acs_task_type("2")//2楼AGV普通任务 - .vehicle_code(vehicle_code) - .material_qty(qty) - .material_info_id(workOrderObj.getLong("workorder_id")) - .material_id(workOrderObj.getLong("material_id")) - .vehicle_type(vehicle_type) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .request_param(whereJson.toJSONString()) - .build(); - - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - - //创建好立即下发 - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - @Override - public void forceFinish(String task_id) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status < " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) { - this.updateTaskStatus(taskObj, "2"); - } else { - throw new BadRequestException("任务已删除或者已完成!"); - } - - } - - - @Override - public void cancel(String task_id) { - - } - - //TODO 暂时不用二次申请 - @Transactional(rollbackFor = Exception.class) - @Override - public String againApply(String task_id) { - /* - * 再次下发任务处理方法 - * 涉及业务：入空载具、出空载具、入物料、出物料 - */ - - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); // 任务表 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); // 点位表 - - JSONObject taskObj = taskTab.query("task_id ='" + task_id + "'").uniqueResult(0); - - JSONObject jsonPoint3 = pointTab.query("point_code = '" + taskObj.getString("point_code3") + "'").uniqueResult(0); - //提前更新这列货位状态，方便生成往这列的任务 - jsonPoint3.put("point_status", "3"); - jsonPoint3.put("material_id", taskObj.getString("material_id")); - pointTab.update(jsonPoint3); - //释放相关货位 - JSONObject point = new JSONObject(); - point.put("lock_type", "1"); - point.put("task_id", ""); - pointTab.update(point, "task_id = '" + taskObj.getString("task_id") + "'"); - - - //养生A区发给ACS需要新的点位(2101-03-1----->21011-03-1) - String point_code = taskObj.getString("point_code3"); - String newPoint = point_code.substring(0, 4) + "1" + point_code.substring(4, 9); - return newPoint; - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java deleted file mode 100644 index 3848674..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HkxSendMaterialTask.java +++ /dev/null @@ -1,263 +0,0 @@ -package org.nl.wms.sch.tasks.sendMaterial; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.util.IdUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - - -/** - * 豪凯自动线线送料任务服务 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class HkxSendMaterialTask extends AbstractAcsTask { - - private final String THIS_CLASS = HkxSendMaterialTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject task, String status) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - - String task_id = task.getString("task_id"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "'").uniqueResult(0); - - //任务取消 - if (StrUtil.equals(status, "0")) { - // 取消删除任务 - if (StrUtil.equals(taskObj.getString("task_status"), TaskStatusEnum.FINISHED.getCode())) { - throw new BadRequestException("已完成不能取消!"); - } - String point_code2 = taskObj.getString("point_code2"); - if (ObjectUtil.isEmpty(point_code2)) { - JSONObject endPoint = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - endPoint.put("lock_type", "1"); - pointTab.update(endPoint); - } - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("remark", "已取消"); - taskTab.update(taskObj); - } - - if ("1".equals(status)) { - // 更新任务状态为执行中 - taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskObj.put("car_no", taskObj.getString("car_no")); - taskTab.update(taskObj); - } - - if (StrUtil.equals(status, "2")) { - // 更改任务状态为完成 - taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - - String point_code2 = taskObj.getString("point_code2"); - JSONObject point2Obj = pointTab.query("point_code = '" + point_code2 + "'").uniqueResult(0); - JSONObject requestObj = task.getJSONObject("request_param"); - //工单标识 - String workorder_id = requestObj.getString("material_info_id"); - //生产工单表【PDM_BD_WorkOrder】 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); - JSONObject workorderObj = workOrderTab.query("workorder_id", workorder_id).uniqueResult(0); - - //区域出入表【st_ivt_regionIO】 - WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO"); - JSONObject regionIoObj = new JSONObject(); - regionIoObj.put("iostorinv_id", IdUtil.getLongId()); - regionIoObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE")); - regionIoObj.put("buss_date", DateUtil.today()); - regionIoObj.put("io_type", "1"); - regionIoObj.put("region_id", point2Obj.getString("region_id")); - regionIoObj.put("region_code", point2Obj.getString("region_code")); - regionIoObj.put("region_name", point2Obj.getString("region_name")); - regionIoObj.put("material_id", taskObj.getString("material_id")); - regionIoObj.put("vehicle_code", taskObj.getString("vehicle_code")); - regionIoObj.put("qty", requestObj.getString("qty")); - regionIoObj.put("bill_status", "3"); - regionIoObj.put("start_point_code", taskObj.getString("point_code1")); - regionIoObj.put("end_point_code", taskObj.getString("point_code3")); - regionIoObj.put("create_mode", "2"); - regionIoObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd")); - regionIoObj.put("create_id", SecurityUtils.getCurrentUserId()); - regionIoObj.put("create_name", SecurityUtils.getCurrentNickName()); - regionIoObj.put("create_time", DateUtil.now()); - regionIoTab.insert(regionIoObj); - - - //完成后入库 - //仓位库存表【ST_IVT_StructIvt】 - WQLObject ivtTab = WQLObject.getWQLObject("ST_IVT_StructIvt"); - JSONObject ivtObj = new JSONObject(); - ivtObj.put("stockrecord_id", IdUtil.getLongId()); - ivtObj.put("point_id", point2Obj.getString("point_id")); - ivtObj.put("point_code", point2Obj.getString("point_code")); - ivtObj.put("point_name", point2Obj.getString("point_name")); - ivtObj.put("region_id", point2Obj.getString("region_id")); - ivtObj.put("region_code", point2Obj.getString("region_code")); - ivtObj.put("region_name", point2Obj.getString("region_name")); - ivtObj.put("instorage_time", DateUtil.now()); - ivtObj.put("pcsn", DateUtil.format(DateUtil.parse(DateUtil.today()), "yyyyMMdd")); - ivtObj.put("ivt_qty", requestObj.getString("qty")); - ivtObj.put("standing_time", workorderObj.getString("standing_time")); - ivtObj.put("material_id", workorderObj.getString("material_id")); - ivtTab.insert(ivtObj); - - // 终点解锁 - point2Obj.put("lock_type", "1"); - point2Obj.put("point_status", "3"); - // 载具类型 - point2Obj.put("vehicle_type", taskObj.getString("vehicle_type")); - pointTab.update(point2Obj); - } - - } - - @Override - public void findNextPoint() { - /* - * 根据业务找对应的终点 - */ - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - WQLObject pointTab = WQLObject.getWQLObject("sch_base_point"); - JSONArray taskArr = taskTab.query("handle_class = '" + THIS_CLASS + "'and is_delete = '0' and task_status = '2'").getResultJSONArray(0); - for (int i = 0; i < taskArr.size(); i++) { - JSONObject taskObj = taskArr.getJSONObject(i); - String vehicle_type = taskObj.getString("vehicle_type"); - JSONObject param1 = new JSONObject(); - param1.put("flag", "1"); - param1.put("region_code", "CPQYA01"); - param1.put("vehicle_type", "%" + vehicle_type + "%"); - //1、查找库区类是否有响应的载具类型和对应的物料 - JSONObject endPoint = WQL.getWO("QSCH_hkxSendMaterial_01").addParamMap(param1).process().uniqueResult(0); - if (ObjectUtil.isEmpty(endPoint)) { - taskObj.put("remark", "成品区无可用货位!"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } else { - taskObj.put("update_time", DateUtil.now()); - taskObj.put("point_code2", endPoint.getString("point_code")); - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskTab.update(taskObj); - - //锁住终点 - endPoint.put("task_id", taskObj.getString("task_id")); - endPoint.put("lock_type", "2"); - pointTab.update(endPoint); - } - - - } - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList acsTaskArr = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - acsTaskArr.add(dto); - } - return acsTaskArr; - } - - @Override - public String createTask(JSONObject whereJson) { - String point_code1 = whereJson.getString("point_code1"); - String vehicle_type = whereJson.getString("vehicle_type"); - String vehicle_code = whereJson.getString("vehicle_code"); - String qty = whereJson.getString("qty"); - - - //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - //判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务"); - - //生产工单表【PDM_BD_WorkOrder】 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); - //点位基础表【SCH_BASE_Point】 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); - String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code"); - - JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); - if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); - - SchTaskDto dto = SchTaskDto.builder() - .task_id(IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("task_type") - .task_name("豪凯线满料") - .material_qty(qty) - .task_status(TaskStatusEnum.SURE_START.getCode()) - .point_code1(point_code1) - .vehicle_code(vehicle_code) - .material_info_id(workOrderObj.getLong("workorder_id")) - .material_id(workOrderObj.getLong("material_id")) - .vehicle_type(vehicle_type) - .handle_class(THIS_CLASS) - .create_time(DateUtil.now()) - .request_param(whereJson.toJSONString()) - .build(); - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - - //创建好立即下发 - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - @Override - public void forceFinish(String task_id) { - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject taskObj = taskTab.query("task_id = '" + task_id + "' and is_delete = '0' and task_status <> " + TaskStatusEnum.FINISHED.getCode()).uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) - this.updateTaskStatus(taskObj, "2"); - } - - - @Override - public void cancel(String task_id) { - - } -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java deleted file mode 100644 index e71d70a..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/YqxSendMaterialTask.java +++ /dev/null @@ -1,263 +0,0 @@ -package org.nl.wms.sch.tasks.sendMaterial; - -import cn.hutool.core.date.DateUtil; -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 lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.core.bean.WQLObject; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.sch.SchTaskDto; -import org.nl.wms.sch.manage.AbstractAcsTask; -import org.nl.wms.sch.manage.TaskStatusEnum; -import org.nl.wms.sch.service.PointService; -import org.nl.wms.sch.service.dto.PointDto; -import org.nl.wms.sch.tasks.AcsTaskDto; -import org.nl.wms.sch.tasks.RegionTypeEnum; -import org.nl.wms.util.IdUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - - -/** - * 油漆线送物料 - */ -@Service -@RequiredArgsConstructor -@Slf4j -public class YqxSendMaterialTask extends AbstractAcsTask { - private final String THIS_CLASS = YqxSendMaterialTask.class.getName(); - - - @Override - @Transactional(rollbackFor = Exception.class) - public void updateTaskStatus(JSONObject taskObj, String status) { - /** - *改变任务状态 - **/ - String task_id = taskObj.getString("task_id"); - WQLObject taskTab = WQLObject.getWQLObject("sch_base_task"); - //点位基础表【SCH_BASE_Point】 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); - JSONObject jsonTask = taskTab.query("task_id='" + task_id + "'").uniqueResult(0); - - if (StrUtil.equals(status, "0")) { - //取消任务，释放相关点位的锁 - String point_code1 = jsonTask.getString("point_code1"); - String point_code2 = jsonTask.getString("point_code1"); - JSONObject param = new JSONObject(); - param.put("lock_type", "1"); - param.put("task_id", ""); - pointTab.update(param, "point_code = '" + point_code1 + "'"); - pointTab.update(param, "point_code = '" + point_code2 + "'"); - - jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("remark", "已取消"); - taskTab.update(jsonTask); - } - - if (TaskStatusEnum.EXECUTING.getCode().equals(status)) { - //更新任务状态为执行中 - jsonTask.put("task_status", TaskStatusEnum.EXECUTING.getCode()); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("car_no", taskObj.getString("car_no")); - taskTab.update(jsonTask); - } - - if (TaskStatusEnum.FINISHED.getCode().equals(status)) { - // 更新任务状态为完成 - jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); - jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); - jsonTask.put("update_time", DateUtil.now()); - jsonTask.put("remark", "任务执行完成"); - taskTab.update(jsonTask); - - - //取消任务，释放相关点位的锁 - String point_code1 = jsonTask.getString("point_code1"); - String point_code2 = jsonTask.getString("point_code1"); - JSONObject param = new JSONObject(); - param.put("lock_type", "1"); - param.put("task_id", ""); - - pointTab.update(param, "point_code = '" + point_code1 + "'"); - - param.put("point_status", "3"); - pointTab.update(param, "point_code = '" + point_code2 + "'"); - } - - } - - @Override - public void findNextPoint() { - String task_status = TaskStatusEnum.SURE_START.getCode(); - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - //点位基础表【SCH_BASE_Point】 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); - JSONArray taskArry = taskTab.query("task_status='" + task_status + "' AND handle_class='" + THIS_CLASS + "' AND is_delete='0' ").getResultJSONArray(0); - for (int i = 0; i < taskArry.size(); i++) { - JSONObject taskObj = taskArry.getJSONObject(i); - String task_id = taskObj.getString("task_id"); - - JSONObject param = new JSONObject(); - param.put("flag", "1"); - JSONObject endPoint = WQL.getWO("QSCH_yqxSendMaterial_01").addParamMap(param).process().uniqueResult(0); - if (ObjectUtil.isEmpty(endPoint)) { - taskObj.put("remark", "电梯无可用点"); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } else { - //锁住点位 - endPoint.put("lock_type", "2"); - endPoint.put("task_id", task_id); - pointTab.update(endPoint); - - //修改任务状态 - taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); - taskObj.put("update_optid", SecurityUtils.getCurrentUserId()); - taskObj.put("update_optname", SecurityUtils.getCurrentNickName()); - taskObj.put("update_time", DateUtil.now()); - taskTab.update(taskObj); - } - } - } - - @Override - @Transactional(rollbackFor = Exception.class) - public String createTask(JSONObject whereJson) { - String point_code1 = whereJson.getString("point_code1"); - String vehicle_type = whereJson.getString("vehicle_type"); - String vehicle_code = whereJson.getString("vehicle_code"); - String qty = whereJson.getString("qty"); - - //生产工单表【PDM_BD_WorkOrder】 - WQLObject workOrderTab = WQLObject.getWQLObject("PDM_BD_WorkOrder"); - //点位基础表【SCH_BASE_Point】 - WQLObject pointTab = WQLObject.getWQLObject("SCH_BASE_Point"); - - //任务表【SCH_BASE_Task】 - WQLObject taskTab = WQLObject.getWQLObject("SCH_BASE_Task"); - //判断当前点是否有未完成的任务 - JSONObject taskObj = taskTab.query("is_delete='0' and point_code1 = '" + point_code1 + "' and task_status <> '" + TaskStatusEnum.FINISHED.getCode() + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(taskObj)) throw new BadRequestException("当前点位" + point_code1 + "存在未完成的任务"); - - - String device_code = pointTab.query("point_code = '" + point_code1 + "'").uniqueResult(0).getString("device_code"); - - JSONObject workOrderObj = workOrderTab.query("device_code = '" + device_code + "' and order_status = '3' and is_delete ='0'").uniqueResult(0); - if (ObjectUtil.isEmpty(workOrderObj)) throw new BadRequestException("该设备当前未生产或者已删除"); - - SchTaskDto dto = SchTaskDto.builder() - .task_id(IdUtil.getLongId()) - .task_code(CodeUtil.getNewCode("TASK_CODE")) - .task_type("task_type") - .task_name("油漆线满料") - .task_status(TaskStatusEnum.SURE_START.getCode()) - .point_code1(point_code1) - .vehicle_code(vehicle_code) - .material_info_id(workOrderObj.getLong("workorder_id")) - .material_id(workOrderObj.getLong("material_id")) - .vehicle_type(vehicle_type) - .handle_class(THIS_CLASS) - .material_qty(qty) - .create_time(DateUtil.now()) - .request_param(whereJson.toJSONString()) - .build(); - //任务表【SCH_BASE_Task】 - JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); - taskTab.insert(json); - - //创建好立即下发 - this.immediateNotifyAcs(); - return String.valueOf(dto.getTask_id()); - } - - - @Override - public void forceFinish(String task_id) { - JSONObject taskObj = WQLObject.getWQLObject("SCH_BASE_Task").query("task_id = '" + task_id + "'").uniqueResult(0); - this.updateTaskStatus(taskObj, TaskStatusEnum.FINISHED.getCode()); - } - - @Override - public void cancel(String task_id) { - - } - - @Transactional(rollbackFor = Exception.class) - public JSONObject findEndPoint(JSONObject json) { - String point_code1 = json.getString("point_code1"); - - WQLObject regionTab = WQLObject.getWQLObject("SCH_BASE_Region"); - - // 根据起点判断是什么区域 然后要入到什么区 - PointDto startDto = SpringContextHolder.getBean(PointService.class).findByCode(point_code1); - if (ObjectUtil.isEmpty(startDto)) throw new BadRequestException("起点点位不存在"); - JSONObject jsonStartRegion = regionTab.query("region_id = '" + startDto.getRegion_id() + "'").uniqueResult(0); - - /* - * 物料入库业务：目前只有2个业务，如果区域不正确则报错 - * 1.共挤线 --> 养生区A - * 2.豪凯线 --> 成品区 - */ - String point_code2 = ""; - if (StrUtil.equals(jsonStartRegion.getString("region_code"), RegionTypeEnum.GJQY.getCode())) { - JSONObject map = new JSONObject(); - map.put("flag", "2"); - map.put("region_code", RegionTypeEnum.YSQA.getCode()); - JSONObject jsonEndPoint = WQL.getWO("ST_REGION_IN_01").addParamMap(map).process().uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonEndPoint)) throw new BadRequestException("仓位不足"); - point_code2 = jsonEndPoint.getString("point_code"); - } else if (StrUtil.equals(jsonStartRegion.getString("region_code"), RegionTypeEnum.HKQY.getCode())) { - JSONObject map = new JSONObject(); - map.put("flag", "2"); - map.put("region_code", RegionTypeEnum.CPQYA.getCode()); - JSONObject jsonEndPoint = WQL.getWO("ST_REGION_IN_01").addParamMap(map).process().uniqueResult(0); - - if (ObjectUtil.isEmpty(jsonEndPoint)) throw new BadRequestException("仓位不足"); - point_code2 = jsonEndPoint.getString("point_code"); - } - - JSONObject resuft = new JSONObject(); - resuft.put("point_code2", point_code2); - return resuft; - } - - @Override - public List addTask() { - /* - * 下发给ACS时需要特殊处理 - */ - 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); - - ArrayList acsTaskArr = new ArrayList<>(); - for (int i = 0; i < arr.size(); i++) { - JSONObject json = arr.getJSONObject(i); - AcsTaskDto dto = AcsTaskDto.builder() - .task_id(json.getString("task_id")) - .task_code(json.getString("task_code")) - .task_type(json.getString("acs_task_type")) - .start_device_code(json.getString("point_code1")) - .next_device_code(json.getString("point_code3")) - .vehicle_code(json.getString("vehicle_code")) - .vehicle_type(json.getString("vehicle_type")) - .priority(json.getString("priority")) - .remark(json.getString("remark")) - .build(); - acsTaskArr.add(dto); - } - return acsTaskArr; - } - -} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql deleted file mode 100644 index e968122..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql +++ /dev/null @@ -1,101 +0,0 @@ -[交易说明] - 交易名： 共挤线满料请求 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_code TYPEAS s_string - 输入.material_id TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - p.point_id, - p.point_code, - p.point_name, - p.block_num, - p.row_num, - p.col_num - FROM - SCH_BASE_Point p - where - p.is_used = '1' - AND is_delete = '0' - AND lock_type = '1' - AND point_status = '3' - and row_num>1 - OPTION 输入.material_id <> "" - p.material_id = 输入.material_id - ENDOPTION - OPTION 输入.region_code <> "" - p.region_code = 输入.region_code - ENDOPTION - OPTION 输入.vehicle_type <> "" - p.can_vehicle_type like 输入.vehicle_type - ENDOPTION - ORDER BY block_num,col_num,row_num - ENDSELECT - ENDQUERY - ENDIF - - IF 输入.flag = "2" - QUERY - SELECT - block_num, - col_num, - COUNT(*) AS sum - FROM - SCH_BASE_Point p - WHERE - p.is_delete = '0' - AND is_used = '1' - AND region_code = 'YSQA01' - AND point_status = '1' - AND lock_type = '1' - AND ( row_num = 1 OR row_num ) - OPTION 输入.vehicle_type <> "" - p.can_vehicle_type like 输入.vehicle_type - ENDOPTION - GROUP BY block_num,col_num - HAVING sum = 9 - ORDER BY block_num,col_num - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hkxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hkxSendMaterial_01.wql deleted file mode 100644 index 04707a7..0000000 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_hkxSendMaterial_01.wql +++ /dev/null @@ -1,69 +0,0 @@ -[交易说明] - 交易名： 豪凯线送料请求 - 所属模块： - 功能简述： - 版权所有： - 表引用： - 版本经历： - -[数据库] - --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 - -[IO定义] - ################################################# - ## 表字段对应输入参数 - ################################################# - 输入.flag TYPEAS s_string - 输入.region_code TYPEAS s_string - 输入.material_id TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - - -[临时表] - --这边列出来的临时表就会在运行期动态创建 - -[临时变量] - --所有中间过程变量均可在此处定义 - -[业务过程] - - ########################################## - # 1、输入输出检查 # - ########################################## - - - ########################################## - # 2、主过程前处理 # - ########################################## - - - ########################################## - # 3、业务主过程 # - ########################################## - - IF 输入.flag = "1" - QUERY - SELECT - p.point_id, - p.point_code, - p.point_name - FROM - SCH_BASE_Point p - WHERE - lock_type = '1' - AND is_used = '1' - AND is_delete = '0' - AND point_status = '1' - OPTION 输入.vehicle_type <> "" - p.can_vehicle_type like 输入.vehicle_type - ENDOPTION - OPTION 输入.region_code <> "" - p.region_code = 输入.region_code - ENDOPTION - ORDER BY row_num,col_num,layer_num - ENDSELECT - ENDQUERY - ENDIF - - - diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java index 8a910fc..dcbd890 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/bill/service/impl/RegionIoServiceImpl.java @@ -1,32 +1,26 @@ package org.nl.wms.st.bill.service.impl; -import com.alibaba.fastjson.JSON; -import lombok.RequiredArgsConstructor; -import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.wql.WQL; -import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.sch.service.RegionService; -import org.nl.wms.sch.tasks.cpOut.CpOutTask; -import org.nl.wms.sch.tasks.sendMaterial.HkxSendMaterialTask; -import org.nl.wms.st.bill.service.RegionIoService; -import org.nl.wms.st.bill.service.dto.RegionIoDto; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import org.springframework.data.domain.Pageable; -import java.util.List; -import java.util.Map; - import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.common.utils.SecurityUtils; -import org.nl.modules.wql.core.bean.ResultBean; +import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.WqlUtil; -import lombok.extern.slf4j.Slf4j; -import cn.hutool.core.util.ObjectUtil; +import org.nl.wms.st.bill.service.RegionIoService; +import org.nl.wms.st.bill.service.dto.RegionIoDto; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; /** * @description 服务实现 @@ -147,21 +141,6 @@ public class RegionIoServiceImpl implements RegionIoService { */ @Override public void makeTask(JSONArray dto) { - WQLObject regionIoTab = WQLObject.getWQLObject("st_ivt_regionIO"); - for (int i = 0; i < dto.size(); i++) { - JSONObject dtoJSONObject = dto.getJSONObject(i); - JSONObject iostorinv = regionIoTab.query("iostorinv_id = '" + dtoJSONObject.getString("iostorinv_id") + "'").uniqueResult(0); - if (ObjectUtil.equal(iostorinv.getString("bill_status"), "3")) - throw new BadRequestException("没有单据或者已出库"); - JSONObject param = new JSONObject(); - param.put("point_code1", dtoJSONObject.getString("start_point_code")); - param.put("vehicle_code", dtoJSONObject.getString("vehicle_code")); -// param.put("vehicle_type", vehicle_type); - param.put("iostorinv_id", dtoJSONObject.getString("iostorinv_id")); - CpOutTask taskBean = SpringContextHolder.getBean(CpOutTask.class); - String task_id = taskBean.createTask(param); - } - } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/rest/StructivtController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/rest/StructivtController.java index d952baf..5a6f01c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/rest/StructivtController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/rest/StructivtController.java @@ -1,6 +1,7 @@ package org.nl.wms.st.structivt.rest; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.st.structivt.service.StructivtService; import org.nl.wms.st.structivt.service.dto.StructivtDto; import org.springframework.data.domain.Pageable; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/StructivtService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/StructivtService.java index de68ef2..9fc0db3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/StructivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/StructivtService.java @@ -1,8 +1,10 @@ package org.nl.wms.st.structivt.service; import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import org.nl.wms.st.structivt.service.dto.StructivtDto; import org.springframework.data.domain.Pageable; + import java.util.Map; import java.util.List; import java.io.IOException; @@ -17,14 +19,16 @@ public interface StructivtService { /** * 查询数据分页 + * * @param whereJson 条件 - * @param page 分页参数 - * @return Map + * @param page 分页参数 + * @return Map */ - Map queryAll(Map whereJson, Pageable page); + Map queryAll(Map whereJson, Pageable page); /** * 查询所有数据不分页 + * * @param whereJson 条件参数 * @return List */ @@ -32,6 +36,7 @@ public interface StructivtService { /** * 根据ID查询 + * * @param stockrecord_id ID * @return Structivt */ @@ -39,6 +44,7 @@ public interface StructivtService { /** * 根据编码查询 + * * @param code code * @return Structivt */ @@ -47,30 +53,35 @@ public interface StructivtService { /** * 创建 + * * @param dto / */ void create(StructivtDto dto); /** * 编辑 + * * @param dto / */ void update(StructivtDto dto); /** * 多选删除 + * * @param ids / */ void deleteAll(Long[] ids); /** * 出库 + * * @param jsonArray */ void outInventory(JSONArray jsonArray); /** * 批量修改 + * * @param datas */ void batchEdit(JSONArray datas); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java index 32c17e7..fe3fe39 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java @@ -45,24 +45,13 @@ public class StructivtServiceImpl implements StructivtService { public Map queryAll(Map whereJson, Pageable page){ JSONObject map = new JSONObject(); map.put("flag", "1"); - map.put("region_code", "(" + whereJson.get("region_code") + ")"); - if (!ObjectUtil.isNull(whereJson.get("point_code"))) { - map.put("point_code", "%" + whereJson.get("point_code") + "%"); - } - if (!ObjectUtil.isNull(whereJson.get("material_code"))) { - map.put("material_code", "%" + whereJson.get("material_code") + "%"); - } - map.put("layer_num", whereJson.get("layer_num")); - map.put("row_num", whereJson.get("row_num")); - map.put("col_num", whereJson.get("col_num")); - map.put("is_used", whereJson.get("is_used")); - map.put("lock_type", whereJson.get("lock_type")); - map.put("point_status", whereJson.get("point_status")); - map.put("vehicle_type", whereJson.get("vehicle_type")); + map.put("region_name", whereJson.get("region_name")); + map.put("point_name", whereJson.get("point_name")); + map.put("vehicle_code", whereJson.get("vehicle_code")); map.put("begin_time", whereJson.get("begin_time")); map.put("end_time", whereJson.get("end_time")); - JSONObject json = WQL.getWO("ST_IVT_STRUCTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "point_code asc"); - JSONArray content = json.getJSONArray("content"); + return WQL.getWO("ST_IVT_STRUCTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "instorage_time DESC"); + /*JSONArray content = json.getJSONArray("content"); JSONArray res = new JSONArray(); for (int i = 0; i < content.size(); i++) { JSONObject cppEntry = content.getJSONObject(i); @@ -87,7 +76,7 @@ public class StructivtServiceImpl implements StructivtService { res.add(cppEntry); } json.put("content", res); - return json; + return json;*/ } @Override @@ -350,5 +339,4 @@ public class StructivtServiceImpl implements StructivtService { } } } - } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/wql/ST_IVT_STRUCTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/wql/ST_IVT_STRUCTIVT.wql index 057286b..8b6eace 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/wql/ST_IVT_STRUCTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/wql/ST_IVT_STRUCTIVT.wql @@ -13,19 +13,13 @@ ################################################# ## 表字段对应输入参数 ################################################# - 输入.flag TYPEAS s_string - 输入.io_region TYPEAS f_string - 输入.region_code TYPEAS f_string - 输入.begin_time TYPEAS s_string - 输入.end_time TYPEAS s_string - 输入.bill_code TYPEAS s_string - 输入.bill_status TYPEAS s_string - 输入.io_type TYPEAS s_string - 输入.lock_type TYPEAS s_string - 输入.material_code TYPEAS s_string - 输入.point_status TYPEAS s_string - 输入.vehicle_type TYPEAS s_string - 输入.is_used TYPEAS s_string + 输入.flag TYPEAS s_string + 输入.point_name TYPEAS s_string + 输入.region_name TYPEAS s_string + 输入.vehicle_code TYPEAS s_string + 输入.begin_time TYPEAS s_string + 输入.end_time TYPEAS s_string + 输入.vehicle_id TYPEAS s_string [临时表] @@ -52,53 +46,38 @@ IF 输入.flag = "1" PAGEQUERY SELECT - point.*, - str.stockrecord_id, - str.pcsn, - str.ivt_qty, - str.qty_unit_id, - str.instorage_time, - str.standing_time + ivt.stockrecord_id, + region.region_name, + point.point_name, + vehicle.vehicle_id, + vehicle.vehicle_code, + SUM( vm.material_qty ) AS qty, + ivt.instorage_time FROM - sch_base_point point - LEFT JOIN st_ivt_structivt str ON str.point_id = point.point_id + st_ivt_structivt ivt + LEFT JOIN sch_base_point point ON ivt.point_id = point.point_id + LEFT JOIN sch_base_region region ON point.region_id = region.region_id + LEFT JOIN md_pb_vehicle vehicle ON point.vehicle_code = vehicle.vehicle_code + LEFT JOIN st_ivt_vehicle_material vm ON vehicle.vehicle_id = vm.vehicle_id WHERE - point.region_code IN 输入.region_code - OPTION 输入.point_code <> "" - point.point_code LIKE 输入.point_code - ENDOPTION - OPTION 输入.point_status <> "" - point.point_status = 输入.point_status - ENDOPTION - OPTION 输入.vehicle_type <> "" - point.vehicle_type = 输入.vehicle_type - ENDOPTION - OPTION 输入.material_code <> "" - point.material_id IN ( - SELECT material_code FROM md_me_materialbase WHERE material_code LIKE 输入.material_code - ) - ENDOPTION - OPTION 输入.layer_num <> "" - point.layer_num = 输入.layer_num - ENDOPTION - OPTION 输入.row_num <> "" - point.row_num = 输入.row_num - ENDOPTION - OPTION 输入.col_num <> "" - point.col_num = 输入.col_num - ENDOPTION - OPTION 输入.lock_type <> "" - point.lock_type = 输入.lock_type - ENDOPTION - OPTION 输入.is_used <> "" - point.is_used = 输入.is_used - ENDOPTION - OPTION 输入.begin_time <> "" - str.instorage_time >= 输入.begin_time - ENDOPTION - OPTION 输入.end_time <> "" - str.instorage_time <= 输入.end_time + 1 = 1 + OPTION 输入.region_name <> "" + region.region_name LIKE CONCAT( '%', 输入.region_name, '%' ) + ENDOPTION + OPTION 输入.point_name <> "" + point.point_name LIKE CONCAT( '%', 输入.point_name, '%' ) ENDOPTION + OPTION 输入.vehicle_code <> "" + vehicle.vehicle_code = 输入.vehicle_code + ENDOPTION + OPTION 输入.begin_time <> "" + ivt.instorage_time >= 输入.begin_time + ENDOPTION + OPTION 输入.end_time <> "" + ivt.instorage_time <= 输入.end_time + ENDOPTION + GROUP BY + ivt.stockrecord_id ENDSELECT ENDPAGEQUERY ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/rest/VMController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/rest/VMController.java new file mode 100644 index 0000000..1fa5d8b --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/rest/VMController.java @@ -0,0 +1,44 @@ +package org.nl.wms.st.vm.rest; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.logging.annotation.Log; +import org.nl.wms.st.vm.service.VMService; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +/** + * @author 张江玮 + * @date 2022/10/31 16:26 + */ +@RestController +@RequiredArgsConstructor +@Api(tags = "组盘管理") +@RequestMapping("/api/vm") +@Slf4j +public class VMController { + + private final VMService vmService; + + @GetMapping + @Log("查询组盘信息") + @ApiOperation("查询组盘信息") + public ResponseEntity query(@RequestParam Map param, Pageable page) { + return new ResponseEntity<>(vmService.query(param, page), HttpStatus.OK); + } + + @PostMapping("/queryDetail") + @Log("查询组盘详情") + @ApiOperation("查询组盘详情") + public ResponseEntity queryDetail(@RequestBody JSONObject param) { + return new ResponseEntity<>(vmService.queryDetail(param), HttpStatus.OK); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/service/VMService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/service/VMService.java new file mode 100644 index 0000000..f46e42c --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/service/VMService.java @@ -0,0 +1,31 @@ +package org.nl.wms.st.vm.service; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import org.springframework.data.domain.Pageable; + +import java.util.Map; + +/** + * @author 张江玮 + * @date 2022/10/31 16:36 + */ +public interface VMService { + + /** + * 查询组盘信息 + * + * @param param String search 载具编码 + * @param page 分页 + * @return 组盘信息 + */ + JSONObject query(Map param, Pageable page); + + /** + * 查询组盘详情 + * + * @param param String vehicle_id 载具标识 + * @return 所有组盘信息 + */ + JSONArray queryDetail(JSONObject param); +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/service/impl/VMServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/service/impl/VMServiceImpl.java new file mode 100644 index 0000000..41db170 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/service/impl/VMServiceImpl.java @@ -0,0 +1,52 @@ +package org.nl.wms.st.vm.service.impl; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.st.vm.service.VMService; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * @author 张江玮 + * @date 2022/10/31 16:39 + */ +@Service +@RequiredArgsConstructor +@Slf4j +public class VMServiceImpl implements VMService { + + + /** + * 查询组盘信息 + * + * @param param String search 载具编码 + * @param page 分页 + * @return 组盘信息 + */ + @Override + public JSONObject query(Map param, Pageable page) { + param.put("flag", "1"); + return WQL + .getWO("ST_IVT_VEHICLE_MATERIAL") + .addParamMap(param) + .pageQuery(WqlUtil.getHttpContext(page), "create_time DESC"); + } + + /** + * 查询组盘详情 + * + * @param param String vehicle_id 载具标识 + * @return 所有组盘信息 + */ + @Override + public JSONArray queryDetail(JSONObject param) { + param.put("flag", "2"); + return WQL.getWO("ST_IVT_VEHICLE_MATERIAL").addParamMap(param).process().getResultJSONArray(0); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/wql/ST_IVT_VEHICLE_MATERIAL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/wql/ST_IVT_VEHICLE_MATERIAL.wql new file mode 100644 index 0000000..3796f96 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/vm/wql/ST_IVT_VEHICLE_MATERIAL.wql @@ -0,0 +1,81 @@ +[交易说明] + 交易名： 仓位库存 + 所属模块： + 功能简述： + 版权所有： + 表引用： + 版本经历： + +[数据库] + --指定数据库，为空采用默认值，默认为db.properties中列出的第一个库 + +[IO定义] + ################################################# + ## 表字段对应输入参数 + ################################################# + 输入.flag TYPEAS s_string + 输入.vehicle_code TYPEAS s_string + 输入.vehicle_id TYPEAS s_string + +[临时表] + --这边列出来的临时表就会在运行期动态创建 + +[临时变量] + --所有中间过程变量均可在此处定义 + +[业务过程] + + ########################################## + # 1、输入输出检查 # + ########################################## + + + ########################################## + # 2、主过程前处理 # + ########################################## + + + ########################################## + # 3、业务主过程 # + ########################################## + + IF 输入.flag = "1" + PAGEQUERY + SELECT + vm.vm_id, + vehicle.vehicle_id, + vehicle.vehicle_code, + SUM( vm.material_qty ) AS qty, + vm.create_name, + vm.create_time + FROM + st_ivt_vehicle_material vm + LEFT JOIN md_pb_vehicle vehicle ON vm.vehicle_id = vehicle.vehicle_id + WHERE + 1 = 1 + OPTION 输入.vehicle_code <> "" + vehicle.vehicle_code LIKE CONCAT( '%', 输入.vehicle_code, '%' ) + ENDOPTION + GROUP BY + vm.vehicle_id + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "2" + QUERY + SELECT + material.material_id, + material.material_code, + material.material_name, + material.base_unit, + vm.material_qty, + vm.material_batch + FROM + st_ivt_vehicle_material vm + LEFT JOIN md_me_materialbase material ON vm.material_id = material.material_id + WHERE + vm.vehicle_id = 输入.vehicle_id + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/util/CommonUtils.java b/lms/nladmin-system/src/main/java/org/nl/wms/util/CommonUtils.java new file mode 100644 index 0000000..6d522e5 --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/wms/util/CommonUtils.java @@ -0,0 +1,45 @@ +package org.nl.wms.util; + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import org.nl.modules.common.utils.SecurityUtils; + +/** + * 公共工具类 + * @author 张江玮 + * @date 2022/11/03 8:45 + */ +public class CommonUtils { + + /** + * 添加公共字段 + * + * @param row 需要添加的行 + */ + public static void addCommonColum(JSONObject row) { + addCreateColum(row); + addUpdateColum(row); + } + + /** + * 添加创建字段 + * + * @param row 需要添加的行 + */ + public static void addCreateColum(JSONObject row) { + row.put("create_id", SecurityUtils.getCurrentUserId()); + row.put("create_name", SecurityUtils.getCurrentNickName()); + row.put("create_time", DateUtil.now()); + } + + /** + * 添加更新字段 + * + * @param row 需要添加的行 + */ + public static void addUpdateColum(JSONObject row) { + row.put("update_optid", SecurityUtils.getCurrentUserId()); + row.put("update_optname", SecurityUtils.getCurrentNickName()); + row.put("update_time", DateUtil.now()); + } +} diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls index 19d2354..2d5f1ff 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue index 3908729..02d4887 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/material/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/material/index.vue @@ -2,8 +2,30 @@
- - +
+ + + + + + +
+ + 物料类别： @@ -20,13 +42,12 @@ - 模糊查询： @@ -38,6 +59,7 @@ - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -101,7 +146,7 @@ - + - + - + 否 是 @@ -127,8 +172,8 @@
- 取消 确认 + 取消
@@ -140,14 +185,17 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - - - - - + + + + + + + + + + + @@ -126,15 +175,37 @@ import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' import { getLodop } from '@/assets/js/lodop/LodopFuncs' -const defaultForm = { num: 1, vehicle_id: null, vehicle_code: null, vehicle_name: null, one_code: null, two_code: null, rfid_code: null, vehicle_type: null, vehicle_width: null, vehicle_long: null, vehicle_height: null, overstruct_type: null, occupystruct_qty: null, ext_id: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null } +const defaultForm = { + num: 1, + vehicle_id: null, + vehicle_code: null, + vehicle_name: null, + one_code: null, + two_code: null, + rfid_code: null, + vehicle_type: null, + vehicle_width: null, + vehicle_long: null, + vehicle_height: null, + overstruct_type: null, + occupystruct_qty: null, + ext_id: null, + create_id: null, + create_name: null, + create_time: null, + update_optid: null, + update_optname: null, + update_time: null, + vehicle_status: '1' +} export default { name: 'Vehicle', - dicts:['vehicle_type'], + dicts: ['vehicle_type', 'vehicle_status'], components: { pagination, crudOperation, rrOperation, udOperation }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ - title: '载具维护', + title: '载具', url: 'api/vehicle', idField: 'vehicle_id', sort: 'vehicle_id,desc', @@ -142,7 +213,7 @@ export default { optShow: { add: true, edit: false, - del: false, + del: true, download: false, reset: true } @@ -150,8 +221,7 @@ export default { }, data() { return { - permission: { - }, + permission: {}, rules: { vehicle_code: [ { required: true, message: '载具编码不能为空', trigger: 'blur' } @@ -164,8 +234,12 @@ export default { ], occupystruct_qty: [ { required: true, message: '占仓位数不能为空', trigger: 'blur' } + ], + vehicle_status: [ + { required: true, message: '托盘状态不能为空', trigger: 'blur' } ] - }} + } + } }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据 diff --git a/lms/nladmin-ui/src/views/wms/sch/point/index.vue b/lms/nladmin-ui/src/views/wms/sch/point/index.vue index cfbce62..d0bc51f 100644 --- a/lms/nladmin-ui/src/views/wms/sch/point/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/point/index.vue @@ -15,7 +15,7 @@ v-model="query.name" clearable size="mini" - placeholder="编码名称" + placeholder="点位编码或名称" @keyup.enter.native="crud.toQuery" /> @@ -69,7 +69,7 @@ /> - + - + - + - + +
- +
@@ -191,7 +192,13 @@ > - + + + + + + + - - - - - + + + + - - - - - - + - +
- 取消 确认 + 取消
@@ -281,28 +282,28 @@ style="width: 100%;" @selection-change="crud.selectionChangeHandler" > - - - - - - - - + + + + + + + + - - + + - - + + - +
@@ -333,7 +334,25 @@ import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -const defaultForm = { point_id: null, point_code: null, point_name: null, point_type: null, point_status: null, lock_type: '1', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null } +const defaultForm = { + point_id: null, + point_code: null, + point_name: null, + point_type: null, + point_status: null, + lock_type: '1', + vehicle_code: null, + source_id: null, + remark: null, + is_used: null, + is_delete: null, + create_id: null, + create_name: null, + create_time: null, + update_optid: null, + update_optname: null, + update_time: null +} export default { name: 'Point', dicts: ['vehicle_type', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type'], @@ -346,7 +365,7 @@ export default { idField: 'point_id', optShow: { add: true, - edit: true, + edit: false, del: true, download: false, reset: true diff --git a/lms/nladmin-ui/src/views/wms/sch/region/index.vue b/lms/nladmin-ui/src/views/wms/sch/region/index.vue index 34e4c3d..0d4f204 100644 --- a/lms/nladmin-ui/src/views/wms/sch/region/index.vue +++ b/lms/nladmin-ui/src/views/wms/sch/region/index.vue @@ -43,8 +43,8 @@
- 取消 确认 + 取消
@@ -58,13 +58,13 @@ > - - - - - - - + + + + + + +