修改提交

wms/hd/nladmin-system/src/main/java/org/nl/wms/.~lock.wms.xls#

@@ -1 +0,0 @@
-,DESKTOP-BT6HP4E/zhang,DESKTOP-BT6HP4E,29.08.2022 16:51,file:///C:/Users/zhang/AppData/Roaming/LibreOffice/4;

wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java

@@ -15,6 +15,7 @@ public class StructFindUtil {
         String material_id = jsonObject.getString("material_id");
         String area_type = jsonObject.getString("area_type");
         String vehicle_code = jsonObject.getString("vehicle_code");
+        String point_code = jsonObject.getString("point_code");
         if (StrUtil.isEmpty(vehicle_code)) {
             throw new BadRequestException("托盘不能为空！");
         }

wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java

@@ -63,57 +63,60 @@ public class SendMaterialTask extends AbstractAcsTask {
             jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode"));
             jsonTask.put("update_time", DateUtil.now());
             jsonTask.put("remark", "任务执行完成");
-            ///审核单据 增加库存 改变出入库表的状态
+            String next_point_code = jsonTask.getString("next_point_code");
-            WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
+            if (!StrUtil.equals(next_point_code, "BZX01")) {
-            JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
+                /// 如果终点不是包装线，审核单据 增加库存 改变出入库表的状态
-            //审核 加库存可和用数量
+                WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_workProcedureIOS");
-            StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
+                JSONObject mstObj = mstTab.query("task_id='" + task_id + "' and is_delete='0'").uniqueResult(0);
-            mstObj.put("bill_status", "50");
+                //审核 加库存可和用数量
-            mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId());
+                StoreIvtServiceImpl ivtService = new StoreIvtServiceImpl();
-            mstObj.put("confirm_optname", SecurityUtils.getNickName());
+                mstObj.put("bill_status", "50");
-            mstObj.put("confirm_time", DateUtil.now());
+                mstObj.put("confirm_optid", SecurityUtils.getCurrentUserId());
-            mstTab.update(mstObj);
+                mstObj.put("confirm_optname", SecurityUtils.getNickName());
+                mstObj.put("confirm_time", DateUtil.now());
+                mstTab.update(mstObj);
 
-            String iostorinv_id = mstObj.getString("iostorinv_id");
+                String iostorinv_id = mstObj.getString("iostorinv_id");
-            String next_point_code = mstObj.getString("end_point_code");
+                String start_point_code = mstObj.getString("start_point_code");
-            String start_point_code = mstObj.getString("start_point_code");
+                JSONObject param = new JSONObject();
-            JSONObject param = new JSONObject();
+                param.put("material_id", mstObj.getString("material_id"));
-            param.put("material_id", mstObj.getString("material_id"));
+                param.put("bill_id", iostorinv_id);
-            param.put("bill_id", iostorinv_id);
+                param.put("qty_unit_id", mstObj.getString("qty_unit_id"));
-            param.put("qty_unit_id", mstObj.getString("qty_unit_id"));
+                param.put("pcsn", mstObj.getString("pcsn"));
-            param.put("pcsn", mstObj.getString("pcsn"));
+                param.put("change_qty", mstObj.getString("qty"));
-            param.put("change_qty", mstObj.getString("qty"));
+                param.put("vehicle_code", mstObj.getString("vehicle_code"));
-            param.put("vehicle_code", mstObj.getString("vehicle_code"));
+                param.put("workprocedure_id", mstObj.getString("workprocedure_id"));
-            param.put("workprocedure_id", mstObj.getString("workprocedure_id"));
+                param.put("is_full", mstObj.getString("is_full"));
-            param.put("is_full", mstObj.getString("is_full"));
+                param.put("stewing_time", mstObj.getString("stewing_time"));
-            param.put("stewing_time", mstObj.getString("stewing_time"));
+                param.put("producetask_id", mstObj.getString("producetask_id"));
-            param.put("producetask_id", mstObj.getString("producetask_id"));
 
-            PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
+                PointServiceImpl pointService = SpringContextHolder.getBean(PointServiceImpl.class);
-            PointDto nextPointDto = pointService.findByCode(next_point_code);
+                PointDto nextPointDto = pointService.findByCode(next_point_code);
-            if (ObjectUtil.isNull(nextPointDto)) {
+                if (ObjectUtil.isNull(nextPointDto)) {
-                throw new BadRequestException("未找到可用点位:" + next_point_code);
+                    throw new BadRequestException("未找到可用点位:" + next_point_code);
+                }
+                PointDto startPointDto = pointService.findByCode(start_point_code);
+                if (ObjectUtil.isNull(startPointDto)) {
+                    throw new BadRequestException("未找到可用点位:" + start_point_code);
+                }
+                param.put("struct_id", nextPointDto.getPoint_id());
+                ivtService.addIvtFlow(param, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE);
+                //解锁仓位，托盘信息，回写到点位上去
+                String vehicle_code = jsonTask.getString("vehicle_code");
+                WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
+                JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("next_point_code") + "'").uniqueResult(0);
+                endpointObj.put("lock_type", "00");
+                endpointObj.put("point_status", "02");
+                endpointObj.put("vehicle_code", vehicle_code);
+                pointTab.update(endpointObj);
+
+                JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
+                startPointObj.put("lock_type", "00");
+                startPointObj.put("point_status", "00");
+                startPointObj.put("vehicle_code", "");
+                pointTab.update(startPointObj);
             }
-            PointDto startPointDto = pointService.findByCode(start_point_code);
-            if (ObjectUtil.isNull(startPointDto)) {
-                throw new BadRequestException("未找到可用点位:" + start_point_code);
-            }
-            param.put("struct_id", nextPointDto.getPoint_id());
-            ivtService.addIvtFlow(param, IvtChangeTypeEnum.ADD_IVT_AND_CAN_USE);
-            //解锁仓位，托盘信息，回写到点位上去
-            String vehicle_code = jsonTask.getString("vehicle_code");
-            WQLObject pointTab = WQLObject.getWQLObject("sch_base_point");
-            JSONObject endpointObj = pointTab.query("point_code='" + jsonTask.getString("next_point_code") + "'").uniqueResult(0);
-            endpointObj.put("lock_type", "00");
-            endpointObj.put("point_status", "02");
-            endpointObj.put("vehicle_code", vehicle_code);
-            pointTab.update(endpointObj);
 
-            JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0);
-            startPointObj.put("lock_type", "00");
-            startPointObj.put("point_status", "00");
-            startPointObj.put("vehicle_code", "");
-            pointTab.update(startPointObj);
             taskTab.update(jsonTask);
         }
 
@@ -261,6 +264,10 @@ public class SendMaterialTask extends AbstractAcsTask {
                     bill_type = BillTypeEnum.FJRK.getCode();
                     endArea_type = AreaEnum.BZZC.getCode();
                     vehicle_code = startPoint.getVehicle_code();
+                    if (StrUtil.equals(is_full, "1")) {
+                        next_point_code = "BZX01";
+                    }
+
                     break;
                 default:
                     qty_unit_id = BussConstant.HN_IN_QTY_UNIT_ID;
@@ -271,48 +278,52 @@ public class SendMaterialTask extends AbstractAcsTask {
             param.put("area_type", endArea_type);
             param.put("vehicle_code", vehicle_code);
             param.put("vehilce_type", vehilce_type);
-            JSONObject inStructObj = StructFindUtil.getInStruct(param);
+            //如果是分拣送到包装线 则不生成入库单信息
-            if (ObjectUtil.isEmpty(inStructObj)) {
+            if (StrUtil.isEmpty(next_point_code)) {
-                throw new BadRequestException("未找到合适的入库仓位！");
+                JSONObject inStructObj = StructFindUtil.getInStruct(param);
+                if (ObjectUtil.isEmpty(inStructObj)) {
+                    throw new BadRequestException("未找到合适的入库仓位！");
+                }
+                next_point_code = inStructObj.getString("struct_code");
+                //创建入库单据
+                //假如静置时间为空，则取物料表上的静置时间
+                if (StrUtil.isEmpty(stewing_time)) {
+                    stewing_time = WQLObject
+                            .getWQLObject("md_me_material")
+                            .query("material_id ='" + material_id + "'")
+                            .uniqueResult(0)
+                            .getString("stewing_time");
+                }
+                JSONObject iosObj = new JSONObject();
+                iosObj.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId());
+                iosObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE"));
+                iosObj.put("io_type", "0");
+                iosObj.put("bill_type", bill_type);
+                iosObj.put("workprocedure_id", workprocedure_id);
+                iosObj.put("ivt_workprocedure_id", workprocedure_id);
+                iosObj.put("material_id", material_id);
+                iosObj.put("vehicle_code", vehicle_code);
+                iosObj.put("producetask_id", producetask_id);
+                iosObj.put("stewing_time", stewing_time);
+                iosObj.put("qty", qty);
+                iosObj.put("qty_unit_id", qty_unit_id);
+                //默认是分配状态
+                iosObj.put("bill_status", "20");
+                iosObj.put("start_point_code", start_point_code);
+                iosObj.put("end_point_code", next_point_code);
+                iosObj.put("start_area", startPoint.getArea_type());
+                iosObj.put("end_area", endArea_type);
+                iosObj.put("cust_id", cust_id);
+                iosObj.put("create_mode", create_mode);
+                iosObj.put("task_id", task_id);
+                iosObj.put("pcsn", pcsn);
+                iosObj.put("create_id", SecurityUtils.getCurrentUserId());
+                iosObj.put("create_name", SecurityUtils.getNickName());
+                iosObj.put("create_time", DateUtil.now());
+                iosObj.put("is_full", is_full);
+                WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj);
             }
-            next_point_code = inStructObj.getString("struct_code");
+
-            //创建入库单据
-            //假如静置时间为空，则取物料表上的静置时间
-            if (StrUtil.isEmpty(stewing_time)) {
-                stewing_time = WQLObject
-                        .getWQLObject("md_me_material")
-                        .query("material_id ='" + material_id + "'")
-                        .uniqueResult(0)
-                        .getString("stewing_time");
-            }
-            JSONObject iosObj = new JSONObject();
-            iosObj.put("iostorinv_id", IdUtil.getSnowflake(1, 1).nextId());
-            iosObj.put("bill_code", CodeUtil.getNewCode("IN_STORE_CODE"));
-            iosObj.put("io_type", "0");
-            iosObj.put("bill_type", bill_type);
-            iosObj.put("workprocedure_id", workprocedure_id);
-            iosObj.put("ivt_workprocedure_id", workprocedure_id);
-            iosObj.put("material_id", material_id);
-            iosObj.put("vehicle_code", vehicle_code);
-            iosObj.put("producetask_id", producetask_id);
-            iosObj.put("stewing_time", stewing_time);
-            iosObj.put("qty", qty);
-            iosObj.put("qty_unit_id", qty_unit_id);
-            //默认是分配状态
-            iosObj.put("bill_status", "20");
-            iosObj.put("start_point_code", start_point_code);
-            iosObj.put("end_point_code", next_point_code);
-            iosObj.put("start_area", startPoint.getArea_type());
-            iosObj.put("end_area", endArea_type);
-            iosObj.put("cust_id", cust_id);
-            iosObj.put("create_mode", create_mode);
-            iosObj.put("task_id", task_id);
-            iosObj.put("pcsn", pcsn);
-            iosObj.put("create_id", SecurityUtils.getCurrentUserId());
-            iosObj.put("create_name", SecurityUtils.getNickName());
-            iosObj.put("create_time", DateUtil.now());
-            iosObj.put("is_full", is_full);
-            WQLObject.getWQLObject("ST_IVT_workProcedureIOS").insert(iosObj);
         }
         String task_status = TaskStatusEnum.START_AND_POINT.getCode();
         PointDto nextPoint = pointService.findByCode(next_point_code);

wms/hd/nladmin-system/src/main/resources/config/application-test.yml

@@ -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
-

wms/hd/nladmin-system/src/main/resources/config/businessTpye.txt

@@ -1,9 +0,0 @@
-//项目协议类型说明
-0：标准协议，荣力营口,杰牌,金力永磁
-1：新锐
-2：贤益
-3：奇达
-4：广钞厂
-5:纽迪希亚
-6：太钢
-7:洁美

wms/hd/nladmin-system/src/main/resources/log/AcsToErp.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE7" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ACS请求ERP/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name=" org.nl.acs.ext.erp.service.impl.AcsToErpServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE7"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/AcsToWms.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE8" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/ACS请求WMS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE8"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/AgvServiceImpl.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE5" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/反馈AGV请求/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.agv.server.impl.AgvServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE5"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/AgvackServlet.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE6" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/AGV请求离开/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.device_driver.magic_agv.AgvackServlet" level="info" additivity="false">
-        <appender-ref ref="FILE6"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/AutoCreateInst.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE3" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/自动创建指令/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-          <appender-ref ref="FILE3"/>
-      </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.modules.quartz.task.AutoCreateInst" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/NDCSocketConnectionAutoRun.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE10" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/DNC/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.start.auto.run.NDCSocketConnectionAutoRun" level="info" additivity="false">
-        <appender-ref ref="FILE10"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/QueryAgvTaskStatus.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE4" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/查询AGV指令状态/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.modules.quartz.task.QueryMagicAgvTaskStatus" level="info" additivity="false">
-        <appender-ref ref="FILE4"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/QueryXZAgvTaskStatus.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE10" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/查询仙知AGV指令状态/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.modules.quartz.task.QueryXZAgvTaskStatus" level="info" additivity="false">
-        <appender-ref ref="FILE10"/>
-    </logger>
-</included>

wms/hd/nladmin-system/src/main/resources/log/WmsToAcs.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE9" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/WMS下发ACS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>200MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>20GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-        </encoder>
-
-    </appender>
-
-  <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
-        <appender-ref ref="FILE3"/>
-    </logger>-->
-
-    <!-- 打印sql -->
-    <logger name="org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl" level="info" additivity="false">
-        <appender-ref ref="FILE9"/>
-    </logger>
-</included>