rev:工单导入/缓存线物料更新

2023-06-08 14:54:25 +08:00
parent 4d446905da
commit 2292512476
15 changed files with 90 additions and 437 deletions
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -5,6 +5,8 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.AcsTaskEnum;
@@ -39,6 +41,7 @@ import org.springframework.util.CollectionUtils;

 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -131,6 +134,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
            String status = row.getString("status");
            // 任务处理类
            try {
+
+                AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
+                if (taskHandler!=null){
+                    taskHandler.updateTaskStatus(row,status);
+                }
                //发布一个任务执行事件
                TaskEvent event = TaskEvent.builder()
                        .task_id(task_id)
@@ -138,9 +146,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
                        .status(status)
                        .build();
                BussEventMulticaster.Publish(event);
-
-                /*AbstractAcsTask taskHandler = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(processing_class));
-                taskHandler.updateTaskStatus(row,status);*/
            } catch (Exception e) {
                log.error("任务状态更新失败:{}", e.getMessage());
                JSONObject json = new JSONObject();
@@ -292,15 +297,15 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
    @Override
    @Async
    public void feedOrderRealQty(JSONObject param) {
-        WQLObject wo = WQLObject.getWQLObject("pdm_produce_workorder");
        if (CollectionUtils.isEmpty(param)){
            return;
        }
        Iterator<String> iterator = param.keySet().iterator();
        while (iterator.hasNext()){
            String workorderCode = iterator.next();
-            String real_qty = param.getString(workorderCode);
-            wo.update(MapOf.of("real_qty",real_qty),"workorder_code = '"+workorderCode+"'");
+            BigDecimal dq_real_qty = param.getBigDecimal(workorderCode);
+            workorderService.update(new UpdateWrapper<PdmProduceWorkorder>()
+                    .set("dq_real_qty",dq_real_qty).eq("workorder_code",workorderCode));
        }
    }
 }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.ext.bigScreen.rest;

+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,7 @@ import java.util.Map;
@Api(tags = "监控大屏")
@RequestMapping("/api/bigScreenScreen")
@Slf4j
+@SaIgnore
@CrossOrigin
 public class BigScreenController {
   private final BigScreenService bigScreenService;
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java
@@ -1,5 +1,6 @@
 package org.nl.wms.ext.bigScreen.rest;

+import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
@Api(tags = "设备监控大屏")
@RequestMapping("/api/deviceScreen")
+@SaIgnore
@Slf4j
 public class DeviceScreenController {
    private final DeviceScreenService deviceScreenService;
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java
@@ -2,6 +2,7 @@
 package org.nl.wms.ext.bigScreen.rest;


+import cn.dev33.satoken.annotation.SaIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -26,6 +27,7 @@ import java.util.Map;
@RequiredArgsConstructor
@Api(tags = "大屏生产监控中心")
@RequestMapping("/api/bigscreen/product")
+@SaIgnore
@Slf4j
 public class ProductController {

--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java
@@ -10,6 +10,7 @@ import org.nl.common.anno.Log;
 import lombok.extern.slf4j.Slf4j;
 import org.nl.common.enums.WorkerOrderEnum;
 import org.nl.common.utils.RedissonUtils;
+import org.nl.common.utils.SecurityUtils;
 import org.nl.common.utils.api.RestBusinessTemplate;
 import org.nl.common.utils.api.ResultCode;
 import org.nl.modules.common.exception.BizCoreException;
@@ -22,8 +23,11 @@ import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;

 /**
 * @author qinx
@@ -86,7 +90,8 @@ public class ProduceshiftorderController{
               throw new BizCoreException(ResultCode.VALIDATE_FAILED);
          }
          /** @see org.nl.common.enums.WorkerOrderEnum */
-          param.put("workorder_status","'2','3','4','5'");
+          param.put("workorder_status","'2','3','4'");
+          param.put("optuser",SecurityUtils.getCurrentUserId());
          List<Map> list = iPdmProduceWorkorderService.getOrderList(param, page);
          return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK);
     }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java
@@ -33,6 +33,8 @@ import org.nl.wms.scheduler_manage.service.scheduler.ISchProcessRouteService;
 import org.nl.wms.scheduler_manage.service.scheduler.labelConverter.impl.FlowElement;
 import org.nl.wms.scheduler_manage.service.task.ISchBaseTaskService;
 import org.nl.wms.scheduler_manage.service.task.dao.SchBaseTask;
+import org.nl.wms.system_manage.service.param.ISysParamService;
+import org.nl.wms.system_manage.service.param.dao.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,6 +66,8 @@ public class SpeEmpTask extends AbstractAcsTask {
    private ISchCachelineVehilematerialService vehilematerialService;
    @Autowired
    private ISchProcessRouteService schProcessRouteService;
+    @Autowired
+    private ISysParamService sysParamService;

    private final Map<String,SpeStatusHandler >  SpeHandles= new HashMap<>();

@@ -86,6 +90,10 @@ public class SpeEmpTask extends AbstractAcsTask {
    @Override
    @Transactional
    public String createTask(JSONObject param) {
+        Param speemp = sysParamService.getOne(new QueryWrapper<Param>().eq("code", "speemp"));
+        if (speemp !=null){
+            return "speemp";
+        }
        //{"workorder_code":230523019,"device_code":"A1_TW_15_6_D","type":"1"}
        String cahceLine = getRouteXmlFlowByWorkprodure(param);
        if (cahceLine == null) { return null; }
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
@@ -103,6 +103,10 @@
        <if test="realproduceend_date != null and realproduceend_date != ''">
            and #{realproduceend_date} >= workorder.realproducestart_date
        </if>
+
+        <if test="optuser != null and optuser != ''">
+            and workorder.current_produce_person_id = #{optuser}
+        </if>
        order by workorder_code desc
    </select>

--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
@@ -288,7 +288,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                            }
                            if (j == 0) {
                                //物料
-                                workorder.setShift_type_scode(col.equals("夜班") ? "0" : "1");
+                                workorder.setShift_type_scode(col.equals("晚上") ? "2" : "1");
                            }
                            if (j == 1) {
                                //物料
@@ -302,12 +302,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                                    errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
                                    error_message = error_message + col + "物料规格对应物料信息不存在，";
                                } else {
-                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(new Predicate<MdMeMaterialbase>() {
-                                        @Override
-                                        public boolean test(MdMeMaterialbase mdMeMaterialbase) {
-                                            return mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH");
-                                        }
-                                    }).findFirst();
+                                    Optional<MdMeMaterialbase> first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH")).findFirst();
                                    if (!first.isPresent()) {
                                        errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在");
                                    }
@@ -333,7 +328,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl<PdmProduceWorko
                            }
                            if (j == 8) {
                                //操作工
-                                SysUser user = userService.getOne(new QueryWrapper<SysUser>().eq("username", col));
+                                SysUser user = userService.getOne(new QueryWrapper<SysUser>().eq("person_name", col));
                                if (ObjectUtil.isEmpty(user)) {
                                    errorMap.put("第" + i + "行" + col, " 操作工没有账号");
                                } else {
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/menu/SysMenuController.java
@@ -43,6 +43,7 @@ public class SysMenuController {

    @GetMapping(value = "/build")
    @ApiOperation("根据用户获取菜单")
+    @Log("caidan")
    public ResponseEntity<Object> buildMenus(@Validated String systemType) {
        //校验系统表是否存在该系统类型
        return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK);
--- a/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
+++ b/mes/hd/nladmin-system/src/main/resources/config/application-prod.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8099
+  port: 8011
 #配置数据源
 spring:
  data:
@@ -8,30 +8,32 @@ spring:
        enabled: true
      client:
        reactive:
-          #endpoints: 172.31.185.110:9200,172.31.154.9:9200 #内网
-          #          endpoints: 192.168.46.2255:8200 #外网
-          endpoints: http://192.168.46.2255:9200 #外网
+          #endpoints: 172.31.185.110:8200,172.31.154.9:8200 #内网
+          #          endpoints: 47.96.133.178:8200 #外网
+          endpoints: http://192.168.46.225:9200 #外网
  elasticsearch:
    rest:
-      #uris: 172.31.185.110:9200,172.31.154.9:9200 #内网
-      #      uris: 192.168.46.2255:8200 #外网
-      uris: http://192.168.46.2255:8200 #外网
-      username: elastic
-      password: 123456
+      #uris: 172.31.185.110:8200,172.31.154.9:8200 #内网
+      #      uris: 47.96.133.178:8200 #外网
+      uris: http://192.168.46.225:9200 #外网
+  #      username: elastic
+  #      password: 123456
  datasource:
    druid:
      db-type: com.alibaba.druid.pool.DruidDataSource
      driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.46.5}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:hl_one_mes}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true&useSSL=false
      username: ${DB_USER:root}
+      #      password: ${DB_PWD:123456}
      password: ${DB_PWD:123456}
-      #password: ${DB_PWD:Root.123456}
+
      # 初始连接数
-      initial-size: 15
+      initial-size: 5
      # 最小连接数
-      min-idle: 45
+      min-idle: 15
      # 最大连接数
-      max-active: 90
+      max-active: 30
      # 是否自动回收超时连接
      remove-abandoned: true
      # 超时时间(以秒数为单位)
@@ -61,11 +63,12 @@ spring:
        reset-enable: false
      filters:
        DruidFilter,stat
+
  redis:
    #数据库索引
-    database: ${REDIS_DB:6}
-    host: ${REDIS_HOST:127.0.0.1}
-    #host: ${REDIS_HOST:localhost}
+    database: ${REDIS_DB:1}
+    #host: ${REDIS_HOST:127.0.0.1}
+    host: ${REDIS_HOST:localhost}
    port: ${REDIS_PORT:6379}
    password: ${REDIS_PWD:}
    #连接超时时间
@@ -169,29 +172,31 @@ sa-token:
  cookie:
    # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com
    domain:
+  is-read-cookie: false

-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://127.0.0.1:6379
+#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://127.0.0.1:6379
 es:
  index: mes_log
+schedulerFile: C:\mes\scheduler.xml
--- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -145,11 +145,11 @@ https://juejin.cn/post/6844903775631572999
            <appender-ref ref="CONSOLE"/>
        </logger>
    </springProfile>
-    <springProfile name="dev3">
-        <root level="debug">
+    <springProfile name="prod">
+        <root level="info">
            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="esLogAppender"/>
        </root>
-
        <logger name="jdbc.audit" level="ERROR" additivity="false">
            <appender-ref ref="CONSOLE"/>
        </logger>
@@ -185,7 +185,7 @@ https://juejin.cn/post/6844903775631572999

    <!--生产环境:打印控制台和输出到文件-->
    <springProfile name="prod">
-        <root level="warn">
+        <root level="info">
            <appender-ref ref="CONSOLE"/>
            <appender-ref ref="asyncFileAppender"/>
        </root>