diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java index 2fa6466..ce97817 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/PressureUtil.java @@ -18,8 +18,9 @@ public class PressureUtil { int qty = (int) whereJson.get("qty"); String record_id = ""; //根据设备查询当前设备以及排产单号 - JSONObject joo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "1").addParam("point_code", device_code).process().uniqueResult(0); + JSONObject joo = WQL.getWO("QSTRUCT_RULE").addParam("flag", "12").addParam("point_code", device_code).process().uniqueResult(0); String producetask_id = joo.getString("producetask_id"); + String device_id = joo.getString("device_id"); if (StrUtil.isEmpty(producetask_id)) { throw new BadRequestException("为找到生产任务！"); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index 666819b..afcb86f 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -53,6 +53,10 @@ public class StructFindUtil { if (StrUtil.isEmpty(workprocedure_id)) { throw new BadRequestException("工序不能为空！"); } + //is_full 传过来的参数如果是2 ，则代表半托，满托都可以出 + if (StrUtil.equals(is_full, "2")) { + is_full = ""; + } JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "3") .addParam("material_id", material_id).addParam("area_type", area_type) .addParam("is_full", is_full).addParam("workprocedure_id", workprocedure_id) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index b0eb7c5..347426d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -114,8 +114,8 @@ public class AcsToWmsController { @PostMapping("/agv") @Log("ACS给WMS反馈任务状态") @ApiOperation("ACS给WMS反馈任务状态") - public ResponseEntity receiveAgvStatus(@RequestBody Map whereJson ) { - return new ResponseEntity<>(acsToWmsService.receiveAgvStatus( whereJson), HttpStatus.OK); + public ResponseEntity receiveAgvStatus(@RequestBody JSONArray arr ) { + return new ResponseEntity<>(acsToWmsService.receiveAgvStatus( arr), HttpStatus.OK); } @PostMapping("/queryCribbingInfo") diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index 5f7d47c..e87cf07 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -1,5 +1,7 @@ package org.nl.wms.ext.acs.service; +import com.alibaba.fastjson.JSONArray; + import java.util.Map; public interface AcsToWmsService { @@ -108,7 +110,7 @@ public interface AcsToWmsService { * @param string 条件 物料条码 * @return Map */ - Map receiveAgvStatus(Map jsonObject); + Map receiveAgvStatus(JSONArray arr); /** * 获取垛形参数 * @return Map diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index f92a664..01677a5 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -142,26 +142,30 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { sendMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject)); //假如是压制下料的几个位置 需要记录不合格数量 if (StrUtil.equals(area_type, AreaEnum.YZQY.getCode())) { - /* JSONObject joo = new JSONObject(); - joo.put("qty", "qty"); + JSONObject joo = new JSONObject(); + joo.put("qty", jsonObject.get("unqualified_qty")); joo.put("device_code", device_code); - joo.put("reason", "reason"); String record_id = PressureUtil.record(joo); //回传不合格记录 WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); - wmsToJnService.feedBackQualityInfo(record_id);*/ + wmsToJnService.feedBackQualityInfo(record_id); } break; case "2": //叫料出库 jsonObject.put("next_point_code", device_code); jsonObject.put("create_mode", "01"); + //机械手1 is_full给1 ，机械手3is_full给空，半托，跟满托都可以出 + if(StrUtil.equals(device_code,"FJJXSSLW101")||StrUtil.equals(device_code,"FJJXSSLW102")){ + is_full ="1"; + } + if (StrUtil.equals(device_code,"FJJXSSLW301")||StrUtil.equals(device_code,"FJJXSSLW302")){ + is_full ="2"; + } jsonObject.put("is_full", is_full); produceInfoByCode = this.getProduceInfoByCode(device_code); //批次 物料，客户要从排产单里面去取 - jsonObject.put("pcsn", "pcsn"); - jsonObject.put("material_id", "1515940603542769664"); - jsonObject.put("cust_id", "1516368197694132224"); + jsonObject.put("material_id", produceInfoByCode.getString("material_id")); callMaterialTask.createTask((JSONObject) JSON.toJSON(jsonObject)); break; @@ -261,6 +265,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { throw new BadRequestException("设备点位不能为空！"); } JSONObject produceInfoByCode = new JSONObject(); + String is_full = (String)jsonObject.get("is_full"); String vehicle_code = (String) jsonObject.get("vehicle_code"); String qty = String.valueOf(jsonObject.get("qty")); //String material_code = (String) jsonObject.get("material_code"); @@ -340,6 +345,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { groubObj.put("create_id", SecurityUtils.getCurrentUserId()); groubObj.put("create_name", SecurityUtils.getNickName()); groubObj.put("create_time", DateUtil.now()); + groubObj.put("is_full", is_full); //去自动码垛还是人工码垛从物料信息里面去取 groubObj.put("is_autopackage", materialObj.getString("is_auto_package")); //假如是分拣机械手，并且托盘为空，则托盘从点位上取 @@ -712,14 +718,35 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } @Override - public Map receiveAgvStatus(Map jsonObject) { + public Map receiveAgvStatus(JSONArray arr) { WQLObject deviceStatus_table = WQLObject.getWQLObject("st_buss_deviceStatus"); - String agv_no = (String) jsonObject.get("agv_no"); - String status = (String) jsonObject.get("status"); - JSONObject statsObj = deviceStatus_table.query("device_type ='1' and device_code ='" + agv_no + "'").uniqueResult(0); - statsObj.put("device_status", status); - statsObj.put("update_time", DateUtil.now()); - deviceStatus_table.update(statsObj); + for (int i = 0; i < arr.size(); i++) { + JSONObject jo = arr.getJSONObject(i); + String agv_no = jo.getString("device_code"); + String status = jo.getString("status"); + String device_status = ""; + // 1-搬运中 2-充电 3-等待 4-故障 5-停用 + if (StrUtil.equals(status, "EXECUTING")) { + device_status = "1"; + } + if (StrUtil.equals(status, "CHARGING")) { + device_status = "2"; + } + if (StrUtil.equals(status, "IDLE")) { + device_status = "3"; + } + if (StrUtil.equals(status, "ERROR")) { + device_status = "4"; + } + if (StrUtil.equals(status, "UNKNOWN") || StrUtil.equals("UNAVAILABLE", status)) { + device_status = "5"; + } + JSONObject statsObj = deviceStatus_table.query("device_type ='1' and device_code ='" + agv_no + "'").uniqueResult(0); + statsObj.put("device_status", device_status); + statsObj.put("update_time", DateUtil.now()); + deviceStatus_table.update(statsObj); + } + JSONObject result = new JSONObject(); result.put("status", HttpStatus.OK.value()); result.put("message", "任务状态反馈成功!"); @@ -746,15 +773,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //从组盘表里面去获取 result = group_table.query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0); } - JSONObject returnjo = new JSONObject(); - returnjo.put("status", HttpStatus.OK.value()); - returnjo.put("message", "任务状态反馈成功!"); - returnjo.put("data", result); - return returnjo; + return result; } - private JSONObject getProduceInfoByCode(String code) { + public static JSONObject getProduceInfoByCode(String code) { //根据 设备点位去找生产任务信息 //1 根据点位去找设备，去找对应的设备信息 JSONObject pointObj = WQLObject.getWQLObject("sch_base_point").query("point_code ='" + code + "'").uniqueResult(0); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java index cc0a6f7..f87c30a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/checkout/rest/CheckOutController.java @@ -24,8 +24,8 @@ import java.util.Map; **/ @RestController @RequiredArgsConstructor -@Api(tags = "手持托盘入窑贵州") -@RequestMapping("/api/pda/ruleSetting") +@Api(tags = "手持人工出库") +@RequestMapping("/api/pda/outStruct") @Slf4j public class CheckOutController { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql index 4629269..c28cbdc 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql @@ -433,3 +433,18 @@ IF 输入.flag = "17" ENDQUERY ENDIF +IF 输入.flag = "18" + QUERY + SELECT + vehiclegroup.is_full, + vehiclegroup.vehicle_code + FROM + st_buss_vehiclegroup vehiclegroup + WHERE + 1 =1 + OPTION 输入.vehicle_code <> "" + st_buss_vehiclegroup.vehicle_code = 输入.vehicle_code + ENDOPTION + ENDSELECT + ENDQUERY + ENDIF diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/rest/VehicleStatusController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/rest/VehicleStatusController.java new file mode 100644 index 0000000..b29f3a7 --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/rest/VehicleStatusController.java @@ -0,0 +1,47 @@ + +package org.nl.wms.pda.vehicleStatus.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.annotation.Log; +import org.nl.wms.pda.vehicleStatus.service.VehicleStatusService; +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; + +import java.util.Map; + +/** + * @author ldjun + * @date 2021-07-26 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "手") +@RequestMapping("/api/pda/vehicleStatus") +@Slf4j +public class VehicleStatusController { + + private final VehicleStatusService vehicleStatusService; + + @PostMapping("/queryInfoBycode") + @Log("根据托盘号查询是否满托") + @ApiOperation("根据托盘号查询是否满托") + public ResponseEntity queryInfoBycode(@RequestBody Map param) { + return new ResponseEntity<>(vehicleStatusService.queryInfoBycode(param), HttpStatus.OK); + } + @PostMapping("/confirm") + @Log("状态修改确定") + @ApiOperation("状态修改确定") + public ResponseEntity Confirm(@RequestBody JSONObject param) { + return new ResponseEntity<>(vehicleStatusService.Confirm(param), HttpStatus.OK); + } + +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/VehicleStatusService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/VehicleStatusService.java new file mode 100644 index 0000000..ffdc30c --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/VehicleStatusService.java @@ -0,0 +1,16 @@ +package org.nl.wms.pda.vehicleStatus.service; + +import com.alibaba.fastjson.JSONObject; + +import java.util.Map; + +public interface VehicleStatusService { + Map queryInfoBycode(Map jsonObject); + /** + * 盘点单确认 + * @param param 条件 + * @return Map + * + */ + Map Confirm( JSONObject param); +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/impl/VehicleStatusServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/impl/VehicleStatusServiceImpl.java new file mode 100644 index 0000000..f7d3f66 --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/vehicleStatus/service/impl/VehicleStatusServiceImpl.java @@ -0,0 +1,74 @@ +package org.nl.wms.pda.vehicleStatus.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.SecurityUtils; +import org.nl.wms.WorkProcedureEnum; +import org.nl.wms.pda.vehicleStatus.service.VehicleStatusService; +import org.nl.wms.sch.manage.AreaEnum; +import org.nl.wms.sch.manage.BillTypeEnum; +import org.nl.wms.st.ivt.IvtChangeTypeEnum; +import org.nl.wms.st.ivt.StoreIvtServiceImpl; +import org.nl.wql.WQL; +import org.nl.wql.core.bean.WQLObject; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +@RequiredArgsConstructor +@Slf4j +public class VehicleStatusServiceImpl implements VehicleStatusService { + + + @Override + public Map queryInfoBycode(Map jsonObject) { + String vehicle_code = jsonObject.get("vehicle_code"); + if (StrUtil.isEmpty(vehicle_code)) { + throw new BadRequestException("托盘号不能为空！"); + } + JSONObject resutl = WQL.getWO("QPADSERVICE").addParam("flag", "18").process().uniqueResult(0); + if (ObjectUtil.isEmpty(resutl)) { + throw new BadRequestException("未找到托盘编码为'" + vehicle_code + "'的托盘信息！"); + } + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功！"); + returnjo.put("result", resutl); + return returnjo; + } + + @Override + public Map Confirm(JSONObject param) { + String vehicle_code = param.getString("vehicle_code"); + String is_full = param.getString("is_full"); + if (StrUtil.isEmpty(vehicle_code)) { + throw new BadRequestException("托盘号不能为空！"); + } + if (StrUtil.isEmpty(is_full)) { + throw new BadRequestException("是否满托不能为空！"); + } + JSONObject ivtObj = WQLObject.getWQLObject("st_ivt_structivt").query("vehicle_code ='" + vehicle_code + "'").uniqueResult(0); + JSONObject groupObj = WQLObject.getWQLObject("st_buss_vehiclegroup").query("vehicle_code ='" + vehicle_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(ivtObj)) { + ivtObj.put("is_full", is_full); + WQLObject.getWQLObject("st_ivt_structivt").update(ivtObj); + } + if (ObjectUtil.isEmpty(groupObj)) { + groupObj.put("is_full", is_full); + WQLObject.getWQLObject("st_buss_vehiclegroup").update(groupObj); + } + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "操作成功！"); + return returnjo; + } + +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java index bdc8069..98be916 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java @@ -204,7 +204,6 @@ public class CallMaterialTask extends AbstractAcsTask { String vehicle_code = form.getString("vehicle_code"); String task_status = TaskStatusEnum.SURE_START.getCode(); String material_id = form.getString("material_id"); - String cust_id = form.getString("cust_id"); String create_mode = form.getString("create_mode"); String pcsn = form.getString("pcsn"); String is_full = form.getString("is_full"); @@ -343,7 +342,6 @@ public class CallMaterialTask extends AbstractAcsTask { iosObj.put("end_point_code", next_point_code); iosObj.put("start_area", startArea_type); iosObj.put("end_area", nextPoint.getArea_type()); - iosObj.put("cust_id", cust_id); iosObj.put("create_mode", create_mode); iosObj.put("task_id", task_id); iosObj.put("pcsn", pcsn); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java index 77e58f3..afa9863 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/task/AutoSynchronDeviceStausTask.java @@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; +import org.nl.wms.ext.acs.service.impl.WmsToJnServiceImpl; import org.nl.wms.sch.manage.buss.CallMaterialTask; import org.nl.wql.WQL; import org.nl.wql.core.bean.WQLObject; @@ -31,6 +32,7 @@ public class AutoSynchronDeviceStausTask { //1 同步压机设备状态 this.SynchronDevice(); //2 反馈给嘉耐 + this.feedBackStatustojn(); } private void SynchronDevice() { @@ -43,27 +45,30 @@ public class AutoSynchronDeviceStausTask { JSONObject devicejo = pointarr.getJSONObject(i); String point_code = devicejo.getString("device_code"); //根据点位去找设备 - String device_code = WQL.getWO("ACSTOMES_001").addParam("flag", "6").addParam("point_code",point_code).process().uniqueResult(0).getString("device_code"); + String device_code = WQL.getWO("ACSTOMES_001").addParam("flag", "6").addParam("point_code", point_code).process().uniqueResult(0).getString("device_code"); JSONObject recordObj = recordTabele.query("device_code='" + device_code + "'").uniqueResult(0); int mode = devicejo.getIntValue("mode"); int error = devicejo.getIntValue("error"); String device_status = ""; - //2空闲，3工作中，4等待搬运 5缺料请求 - if (mode==2){ - device_status="3"; + //2空闲，3工作中，4等待搬运 5缺料请求 0 关机() + if (mode == 2) { + device_status = "3"; } - if (mode==3){ - device_status="1"; + if (mode == 3) { + device_status = "1"; } - if (mode==4){ - device_status="2"; + if (mode == 4) { + device_status = "2"; } - if (mode==5){ - device_status="5"; + if (mode == 5) { + device_status = "5"; + } + if (mode == 0) { + device_status = "6"; } - if (error >0){ - device_status="4"; + if (error > 0) { + device_status = "4"; } recordObj.put("device_status", device_status); recordObj.put("update_time", DateUtil.now()); @@ -73,6 +78,11 @@ public class AutoSynchronDeviceStausTask { } + private void feedBackStatustojn() { + WmsToJnServiceImpl wmsToJnService = new WmsToJnServiceImpl(); + wmsToJnService.feedBackStatus(new JSONObject()); + } + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls index ad3f80e..34e15a9 100644 Binary files a/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls and b/wms/hd/nladmin-system/src/main/java/org/nl/wms/wms.xls differ diff --git a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml index b275e7d..f7075e7 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/wms/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -60,7 +60,7 @@ spring: multi-statement-alagvslow: true data: mongodb: - host: 47.111.78.178 + host: 192.168.81.251 port: 27017 database: nlacs redis: diff --git a/wms/hd/nladmin-system/src/main/resources/config/application-test.yml b/wms/hd/nladmin-system/src/main/resources/config/application-test.yml deleted file mode 100644 index 058f635..0000000 --- a/wms/hd/nladmin-system/src/main/resources/config/application-test.yml +++ /dev/null @@ -1,164 +0,0 @@ -server: - port: 8010 -#配置数据源 -spring: - profiles: - test - datasource: - druid: - db-type: com.alibaba.druid.pool.DruidDataSource - driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:llsh_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - username: ${DB_USER:root} - #password: ${DB_PWD:P@ssw0rd} - password: ${DB_PWD:Root.123456} - # 初始连接数 - initial-size: 5 - # 最小连接数 - min-idle: 15 - # 最大连接数 - max-active: 30 - # 是否自动回收超时连接 - remove-abandoned: true - # 超时时间(以秒数为单位) - remove-abandoned-timeout: 180 - # 获取连接超时时间 - max-wait: 3000 - # 连接有效性检测时间 - time-between-eviction-runs-millis: 60000 - # 连接在池中最小生存的时间 - min-evictable-idle-time-millis: 300000 - # 连接在池中最大生存的时间 - max-evictable-idle-time-millis: 900000 - # 指明连接是否被空闲连接回收器(如果有)进行检验.如果检测失败,则连接将被从池中去除 - test-while-idle: true - # 指明是否在从池中取出连接前进行检验,如果检验失败, 则从池中去除连接并尝试取出另一个 - test-on-borrow: true - # 是否在归还到池中前进行检验 - test-on-return: false - # 检测连接是否有效 - validation-query: select 1 - # 配置监控统计 - webStatFilter: - enabled: true - stat-view-servlet: - enabled: true - url-pattern: /druid/* - reset-enable: false - filter: - stat: - enabled: true - # 记录慢SQL - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: true - wall: - config: - multi-statement-alagvslow: true - data: - mongodb: - host: 127.0.0.1 - port: 27017 - database: logdb - redis: - #数据库索引 - database: ${REDIS_DB:8} - host: ${REDIS_HOST:47.111.78.178} - port: ${REDIS_PORT:6379} - password: ${REDIS_PWD:} - #连接超时时间 - timeout: 5000 -# 登录相关配置 -login: - # 登录缓存 - cache-enable: true - # 是否限制单用户登录 - single-login: false - # 验证码 - login-code: - # 验证码类型配置 查看 LoginProperties 类 - code-type: arithmetic - # 登录图形验证码有效时间/分钟 - expiration: 2 - # 验证码高度 - width: 111 - # 验证码宽度 - heigth: 36 - # 内容长度 - length: 2 - # 字体名称，为空则使用默认字体 - font-name: - # 字体大小 - font-size: 25 - -#jwt -jwt: - header: Authorization - # 令牌前缀 - token-start-with: Bearer - # 必须使用最少88位的Base64对该令牌进行编码 - base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI= - # 令牌过期时间 此处单位/毫秒 ，默认4小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html - token-validity-in-seconds: 14400000 - # 在线用户key - online-key: online-token- - # 验证码 - code-key: code-key- - # token 续期检查时间范围（默认30分钟，单位毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期 - detect: 1800000 - # 续期时间范围，默认1小时，单位毫秒 - renew: 3600000 - -#是否允许生成代码，生产环境设置为false -generator: - enabled: true - -#是否开启 swagger-ui -swagger: - enabled: true - -# IP 本地解析 -ip: - local-parsing: true - -# 文件存储路径 -file: - mac: - path: ~/file/ - avatar: ~/avatar/ - linux: - path: /home/eladmin/file/ - avatar: /home/eladmin/avatar/ - windows: - path: C:\eladmin\file\ - avatar: C:\eladmin\avatar\ - # 文件大小 /M - maxSize: 100 - avatarMaxSize: 5 - - - -jetcache: - defaultCacheType: LOCAL - statIntervalMinutes: 15 - areaInCacheName: false - hiddenPackages: com.yb - local: - default: - type: caffeine - limit: 100 - keyConvertor: fastjson - expireAfterWriteInMillis: 60000 - remote: - default: - type: redis.lettuce - keyConvertor: fastjson - valueEncoder: kryo - valueDecoder: kryo - poolConfig: - minIdle: 5 - maxIdle: 200 - maxTotal: 1000 - uri: - - redis://47.111.78.178:6379 - diff --git a/wms/hd/nladmin-system/src/main/resources/config/businessTpye.txt b/wms/hd/nladmin-system/src/main/resources/config/businessTpye.txt deleted file mode 100644 index b8b3ab4..0000000 --- a/wms/hd/nladmin-system/src/main/resources/config/businessTpye.txt +++ /dev/null @@ -1,9 +0,0 @@ -//项目协议类型说明 -0：标准协议，荣力营口,杰牌,金力永磁 -1：新锐 -2：贤益 -3：奇达 -4：广钞厂 -5:纽迪希亚 -6：太钢 -7:洁美 \ No newline at end of file diff --git a/wms/hd/nladmin-system/src/main/resources/log/AcsToErp.xml b/wms/hd/nladmin-system/src/main/resources/log/AcsToErp.xml deleted file mode 100644 index 8916def..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AcsToErp.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/ACS请求ERP/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml b/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml deleted file mode 100644 index 6cbff56..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/ACS请求WMS/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml b/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml deleted file mode 100644 index aa005b1..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/反馈AGV请求/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml b/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml deleted file mode 100644 index 288d587..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/AGV请求离开/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml deleted file mode 100644 index fe653c6..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - ${LOG_HOME}/自动创建指令/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml deleted file mode 100644 index adb00cb..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/DNC/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml b/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml deleted file mode 100644 index 3d40818..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/查询AGV指令状态/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml b/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml deleted file mode 100644 index 5efe75a..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/查询仙知AGV指令状态/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - - diff --git a/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml b/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml deleted file mode 100644 index 0efd084..0000000 --- a/wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - ${LOG_HOME}/WMS下发ACS/%d{yyyy-MM-dd}.%i.log - - 15 - - 200MB - - 20GB - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - - - - - - - - - - -