Merge remote-tracking branch 'origin/jnmc-jinco' into jnmc-jinco

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

@@ -113,8 +113,9 @@ public class PdaDocQcController {
      * @return
      */
     @GetMapping("/getLotInfoList")
-    public AjaxResult getLotInfoList(@RequestParam(required = false) String status) {
-        List<LotInfoFctAgvDTO> lotInfoList = iLotInfoFctAgvService.getLotInfoList(status);
+    public AjaxResult getLotInfoList(@RequestParam(required = false) String status, @RequestParam() String type) {
+        Assert.isTrue(StringUtils.isNotBlank(type), "Type is required");
+        List<LotInfoFctAgvDTO> lotInfoList = iLotInfoFctAgvService.getLotInfoList(status, type);
         return AjaxResult.success("success", lotInfoList);
     }
 

ruoyi-admin/src/main/resources/logback.xml

@@ -2,6 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
 	<property name="log.path" value="../../../logs/ruoyi/logs" />
+	<!--<property name="log.path" value="/Users/gizmo/JavaProjectsFiles/logs/ruoyi/logs" />-->
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

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

@@ -11,9 +11,10 @@ public interface ILotInfoFctAgvService extends CrudService<LotInfoFctAgvEntity,
     /**
      * 根据批次号状态获取批次信息列表
      * @param status 批次号状态 0-未处理 1-AGV处理 2-人工处理
+     * @param type 产线类型 LSN-硫酸镍 LHN-氯化镍
      * @return
      */
-    List<LotInfoFctAgvDTO> getLotInfoList(String status);
+    List<LotInfoFctAgvDTO> getLotInfoList(String status, String type);
 
     /**
      * 更新批次号的状态

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

@@ -23,17 +23,19 @@ public class LotInfoFctAgvService extends CrudServiceImpl<LotInfoFctAgvDao, LotI
 
     private static final String NOT_PROCESS = "0";
 
-
     /**
      * 获取批次信息列表
      * @param status 状态
+     * @param type 产线类型
      * @return
      */
     @Override
-    public List<LotInfoFctAgvDTO> getLotInfoList(String status) {
+    public List<LotInfoFctAgvDTO> getLotInfoList(String status, String type) {
         status = StringUtils.isBlank(status) ? NOT_PROCESS : status;
         Wrapper<LotInfoFctAgvEntity> lambdaQueryWrapper = Wrappers.<LotInfoFctAgvEntity>lambdaQuery()
-                .eq(LotInfoFctAgvEntity::getStatus, status).orderByDesc(LotInfoFctAgvEntity::getCreateDate);
+                .eq(LotInfoFctAgvEntity::getStatus, status)
+                .eq(LotInfoFctAgvEntity::getSprodType, type)
+                .orderByDesc(LotInfoFctAgvEntity::getCreateDate);
         List<LotInfoFctAgvEntity> lotInfoFctAgvEntities = baseDao.selectList(lambdaQueryWrapper);
         return CollectionUtils.isEmpty(lotInfoFctAgvEntities)
                 ? Lists.newArrayList() : ConvertUtils.sourceToTarget(lotInfoFctAgvEntities, LotInfoFctAgvDTO.class);