镍盐蝌蚪文

ruoyi-admin/src/main/java/com/ruoyi/nieyan/controller/pda/PdaDocQcController.java

@@ -109,7 +109,7 @@ public class PdaDocQcController {
 
 
     /**
-     * 对接BMS获取批次列表
+     * 根据产品类型及状态获取对接BMS批次列表
      * @return
      */
     @GetMapping("/getLotInfoList")
@@ -119,6 +119,26 @@ public class PdaDocQcController {
         return AjaxResult.success("success", lotInfoList);
     }
 
+    /**
+     * 获取批次信息列表中所有产品类型
+     * @return
+     */
+    @GetMapping("/getBaseSkuBySprodTypeList")
+    public AjaxResult getBaseSkuBySprodTypeList() {
+        return AjaxResult.success("success", iLotInfoFctAgvService.getBaseSkuBySprodTypeList());
+    }
+
+    /**
+     * 根据产品类型获取对接BMS批次列表
+     * @return
+     */
+    @GetMapping("/getLotInfoByTypeList")
+    public AjaxResult getLotInfoByTypeList(@RequestParam String type) {
+        Assert.isTrue(StringUtils.isNotBlank(type), "Type is required");
+        List<LotInfoFctAgvDTO> lotInfoList = iLotInfoFctAgvService.getLotInfoList(type);
+        return AjaxResult.success("success", lotInfoList);
+    }
+
     /**
      * 对接BMS获取质检信息
      * @param lotNo 批次号

ruoyi-admin/src/main/resources/application-dev.yml

@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.100.220.92:3306/warewms-jnmc-jinco_zx?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-                username: warewms
-                password: warewms123
+                url: jdbc:mysql://localhost:3306/jinco?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                username: root
+                password: root
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -57,13 +57,13 @@ spring:
                         multi-statement-allow: true
     redis:
         # 地址
-        host: 154.12.20.200
+        host: localhost
         # 端口，默认为6379
         port: 6379
         # 数据库索引
         database: 0
         # 密码
-        password:
+        password: 123456
         # 连接超时时间
         timeout: 10s
         lettuce:

ruoyi-admin/src/test/java/com/ruoyi/admin/test/base/WarehouseTest.java

@@ -2,18 +2,20 @@ package com.ruoyi.admin.test.base;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.RuoYiApplication;
+import com.ruoyi.ams.agv.ndc.AciService;
 import com.ruoyi.ams.agv.ndc.domain.AmsHexdefineDetail;
 import com.ruoyi.ams.agv.ndc.domain.AmsTask;
 import com.ruoyi.ams.agv.ndc.service.IAmsHexdefineDetailService;
 import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
+import com.ruoyi.ams.agv.ndc.thread.AciServiceThread;
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
 import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
 import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
+import com.ruoyi.ams.business.IBusinessService;
 import com.ruoyi.ams.business.domain.FilterLockInvLocationDTO;
 import com.ruoyi.ams.config.domain.AsnSoStrategy;
 import com.ruoyi.ams.config.domain.FlowConfigHeader;
 import com.ruoyi.ams.config.domain.dto.InWarehouseDTO;
-import com.ruoyi.ams.business.IBusinessService;
 import com.ruoyi.ams.config.domain.dto.LotattDTO;
 import com.ruoyi.ams.config.domain.dto.OutWarehouseDTO;
 import com.ruoyi.ams.config.mapper.AsnSoStrategyMapper;
@@ -40,7 +42,6 @@ import com.ruoyi.base.service.IBaseIdsequenceService;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import com.ruoyi.base.service.IBaseWarehouseService;
 import com.ruoyi.base.utils.IdSequenceUtils;
-import com.ruoyi.framework.web.domain.server.Sys;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -239,6 +240,15 @@ public class WarehouseTest {
         System.out.println(header.getAsnNo());
     }
 
+    @Autowired
+    private AciService aciService;
+
+    @Test
+    public void testNDC(){
+        Thread thread = new Thread(new AciServiceThread(aciService));
+        thread.start();
+    }
+
     @Test
     public void initDocOrderData() {
         String soNo = idSequenceUtils.generateId("ORDERNO");

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnDetailsServiceImpl.java

@@ -185,10 +185,13 @@ public class WmsDocAsnDetailsServiceImpl implements IWmsDocAsnDetailsService {
             if (CollectionUtil.isEmpty(totalInfoByStatusList)) continue;
             List<TotalInfoDTO> passRateTotalList = totalInfoByStatusList.stream().map(totalInfoByStatus -> {
                 TotalInfoDTO totalInfo = new TotalInfoDTO();
-                TotalInfoDTO totalInfoDTOByDay = item.getTotalInfoDTOList().stream().filter(totalInfoByDay -> totalInfoByDay.getTime().equals(totalInfoByStatus.getTime())).findFirst().orElseGet(() -> null);
+                TotalInfoDTO totalInfoDTOByDay = item.getTotalInfoDTOList().stream().filter(totalInfoByDay ->
+                        totalInfoByDay.getTime().equals(totalInfoByStatus.getTime())).findFirst().orElseGet(() -> null);
                 //合格率
-                BigDecimal passRate = CompareUtil.compare(totalInfoByStatus.getTotal(), BigDecimal.ZERO) == 0 || CompareUtil.compare(totalInfoDTOByDay.getTotal(), BigDecimal.ZERO) == 0 ?
-                        BigDecimal.ZERO : totalInfoByStatus.getTotal().multiply(new BigDecimal("100")).divide(totalInfoDTOByDay.getTotal()).setScale(2, RoundingMode.HALF_UP);
+                BigDecimal passRate = CompareUtil.compare(totalInfoByStatus.getTotal(), BigDecimal.ZERO) == 0
+                        || CompareUtil.compare(totalInfoDTOByDay.getTotal(), BigDecimal.ZERO) == 0 ?
+                        BigDecimal.ZERO : totalInfoByStatus.getTotal().multiply(new BigDecimal("100"))
+                        .divide(totalInfoDTOByDay.getTotal()).setScale(2, RoundingMode.HALF_UP);
                 totalInfo.setTotal(passRate);
                 totalInfo.setTime(totalInfoByStatus.getTime());
                 return totalInfo;

warewms-ams/src/main/java/com/ruoyi/ams/nieyan/service/ILotInfoFctAgvService.java

@@ -2,12 +2,17 @@ package com.ruoyi.ams.nieyan.service;
 
 import com.ruoyi.ams.nieyan.dto.LotInfoFctAgvDTO;
 import com.ruoyi.ams.nieyan.entity.LotInfoFctAgvEntity;
+import com.ruoyi.base.domain.BaseSku;
 import com.ruoyi.framework.service.CrudService;
 
 import java.util.List;
 
 public interface ILotInfoFctAgvService extends CrudService<LotInfoFctAgvEntity, LotInfoFctAgvDTO> {
 
+    List<LotInfoFctAgvDTO> getLotInfoList(String type);
+
+    List<BaseSku> getBaseSkuBySprodTypeList();
+
     /**
      * 根据批次号状态获取批次信息列表
      * @param status 批次号状态 0-未处理 1-AGV处理 2-人工处理

warewms-ams/src/main/java/com/ruoyi/ams/nieyan/service/impl/LotInfoFctAgvService.java

@@ -8,14 +8,17 @@ import com.ruoyi.ams.nieyan.dao.LotInfoFctAgvDao;
 import com.ruoyi.ams.nieyan.dto.LotInfoFctAgvDTO;
 import com.ruoyi.ams.nieyan.entity.LotInfoFctAgvEntity;
 import com.ruoyi.ams.nieyan.service.ILotInfoFctAgvService;
+import com.ruoyi.base.domain.BaseSku;
+import com.ruoyi.base.service.IBaseSkuService;
 import com.ruoyi.common.utils.ConvertUtils;
 import com.ruoyi.framework.service.impl.CrudServiceImpl;
 import org.apache.commons.compress.utils.Lists;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class LotInfoFctAgvService extends CrudServiceImpl<LotInfoFctAgvDao, LotInfoFctAgvEntity, LotInfoFctAgvDTO> implements ILotInfoFctAgvService  {
@@ -23,25 +26,64 @@ public class LotInfoFctAgvService extends CrudServiceImpl<LotInfoFctAgvDao, LotI
 
     private static final String NOT_PROCESS = "0";
 
+    @Autowired
+    private IBaseSkuService baseSkuService;
+
+    /**
+     *获取批次信息列表
+     * @param type
+     * @return
+     */
+    @Override
+    public List<LotInfoFctAgvDTO> getLotInfoList(String type) {
+        List<LotInfoFctAgvDTO> lotInfoFctAgvList = getLotInfoList(null, type, null);
+        return CollectionUtils.isEmpty(lotInfoFctAgvList) ?
+                lotInfoFctAgvList : lotInfoFctAgvList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() ->
+                new TreeSet<>(Comparator.comparing(LotInfoFctAgvDTO::getSlot))), ArrayList::new));
+    }
+
+    /**
+     *获取批次信息列表中所有产品类型
+     * @return
+     */
+    @Override
+    public List<BaseSku> getBaseSkuBySprodTypeList() {
+        List<LotInfoFctAgvEntity> lotInfoFctAgvList = baseDao.selectList(Wrappers.<LotInfoFctAgvEntity>lambdaQuery().eq(LotInfoFctAgvEntity::getStatus, NOT_PROCESS));
+        if (CollectionUtils.isEmpty(lotInfoFctAgvList)) return Lists.newArrayList();
+        List<String> sprodTypeList = lotInfoFctAgvList.stream().map(LotInfoFctAgvEntity::getSprodType).distinct().collect(Collectors.toList());
+        List<BaseSku> baseSkuList = baseSkuService.selectBaseSkuBySprodTypeList(sprodTypeList);
+        return baseSkuList;
+    }
+
     /**
      * 获取批次信息列表
-     * @param status 状态
-     * @param type 产线类型
+     * @param status 批次号状态 0-未处理 1-AGV处理 2-人工处理
+     * @param type 产线类型 LSN-硫酸镍 LHN-氯化镍
      * @return
      */
     @Override
     public List<LotInfoFctAgvDTO> getLotInfoList(String status, String type) {
+        return getLotInfoList(status, type, null);
+    }
+
+    /**
+     * 获取批次信息列表
+     * @param status 状态
+     * @param type 产线类型
+     * @return
+     */
+    private List<LotInfoFctAgvDTO> getLotInfoList(String status, String type, String slot) {
         status = StringUtils.isBlank(status) ? NOT_PROCESS : status;
         Wrapper<LotInfoFctAgvEntity> lambdaQueryWrapper = Wrappers.<LotInfoFctAgvEntity>lambdaQuery()
                 .eq(LotInfoFctAgvEntity::getStatus, status)
                 .eq(LotInfoFctAgvEntity::getSprodType, type)
+                .eq(StringUtils.isNotBlank(slot), LotInfoFctAgvEntity::getSlot, slot)
                 .orderByDesc(LotInfoFctAgvEntity::getCreateDate);
         List<LotInfoFctAgvEntity> lotInfoFctAgvEntities = baseDao.selectList(lambdaQueryWrapper);
         return CollectionUtils.isEmpty(lotInfoFctAgvEntities)
                 ? Lists.newArrayList() : ConvertUtils.sourceToTarget(lotInfoFctAgvEntities, LotInfoFctAgvDTO.class);
     }
 
-
     /**
      * 更新批次号的状态
      * @param id 业务id

warewms-base/src/main/java/com/ruoyi/base/mapper/BaseSkuMapper.java

@@ -1,9 +1,10 @@
 package com.ruoyi.base.mapper;
 
-import java.util.List;
 import com.ruoyi.base.domain.BaseSku;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 物料信息Mapper接口
  * 
@@ -66,4 +67,11 @@ public interface BaseSkuMapper
      * @return
      */
      List<BaseSku> selectBaseSkuBySkuTypeList(List<String> list);
+
+    /**
+     * 根据BMS物料类型查询物料
+     * @param sprodTypeList
+     * @return
+     */
+     List<BaseSku> selectBaseSkuBySprodTypeList(@Param("sprodTypeList") List<String> sprodTypeList);
 }

warewms-base/src/main/java/com/ruoyi/base/service/IBaseSkuService.java

@@ -1,8 +1,9 @@
 package com.ruoyi.base.service;
 
-import java.util.List;
 import com.ruoyi.base.domain.BaseSku;
 
+import java.util.List;
+
 /**
  * 物料信息Service接口
  * 
@@ -65,4 +66,6 @@ public interface IBaseSkuService
      * @return
      */
      List<BaseSku> selectBaseSkuBySkuTypeList(List<String> list);
+
+    List<BaseSku> selectBaseSkuBySprodTypeList(List<String> sprodTypeList);
 }

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseSkuServiceImpl.java

@@ -1,12 +1,13 @@
 package com.ruoyi.base.service.impl;
 
-import java.util.List;
+import com.ruoyi.base.domain.BaseSku;
+import com.ruoyi.base.mapper.BaseSkuMapper;
+import com.ruoyi.base.service.IBaseSkuService;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.base.mapper.BaseSkuMapper;
-import com.ruoyi.base.domain.BaseSku;
-import com.ruoyi.base.service.IBaseSkuService;
+
+import java.util.List;
 
 /**
  * 物料信息Service业务层处理
@@ -99,4 +100,9 @@ public class BaseSkuServiceImpl implements IBaseSkuService
     public List<BaseSku> selectBaseSkuBySkuTypeList(List<String> list) {
         return baseSkuMapper.selectBaseSkuBySkuTypeList(list);
     }
+
+    @Override
+    public List<BaseSku> selectBaseSkuBySprodTypeList(List<String> sprodTypeList) {
+        return baseSkuMapper.selectBaseSkuBySprodTypeList(sprodTypeList);
+    }
 }