测试接口

hx-common/common-client-util/pom.xml

@@ -28,6 +28,11 @@
             <artifactId>service-file-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

hx-common/common-client-util/src/main/java/com/fjhx/utils/UserClientUtil.java

@@ -14,7 +14,14 @@ public class UserClientUtil {
     /**
      * 用户模块调用
      */
-    private static final IUserSearchClient userSearchClient = SpringUtil.getBean(IUserSearchClient.class);
+    private static IUserSearchClient userSearchClient = null;
+
+    private synchronized static IUserSearchClient getUserSearchClient() {
+        if (userSearchClient == null) {
+            userSearchClient = SpringUtil.getBean(IUserSearchClient.class);
+        }
+        return userSearchClient;
+    }
 
     /**
      * 通过userId获取
@@ -27,7 +34,7 @@ public class UserClientUtil {
             return new HashMap<>();
         }
 
-        R<Map<Long, String>> r = userSearchClient.mapByUser(userIdList);
+        R<Map<Long, String>> r = getUserSearchClient().mapByUser(userIdList);
         if (r.getCode() == ResultCode.SUCCESS.getCode()) {
             return r.getData();
         }

hx-common/common-tool/src/main/java/com/fjhx/utils/Assert.java

@@ -55,5 +55,16 @@ public class Assert {
         }
     }
 
+    /**
+     * 验证id是否正确
+     *
+     * @param id     参数
+     * @param errStr 异常提示
+     */
+    public static void isAaaignId(Object id, String errStr) {
+        if (id == null || id.toString().length() != 19) {
+            throw new ServiceException(errStr);
+        }
+    }
 
 }

hx-common/library-product/src/main/java/com/fjhx/service/impl/ClassifyServiceImpl.java

@@ -119,6 +119,8 @@ public class ClassifyServiceImpl extends ServiceImpl<ClassifyMapper, Classify> i
     @Override
     public List<Long> getChildrenIdList(Long classifyId) {
 
+        Assert.isAaaignId(classifyId, "分类id错误");
+
         List<Classify> list = lambdaQuery()
                 .select(BaseEntity::getId)
                 .eq(BaseEntity::getTenantId, AuthUtil.getTenantId())

hx-service-api/storage-api/src/main/java/com/fjhx/entity/scheduling/StockSchedulingTest.java

@@ -0,0 +1,113 @@
+package com.fjhx.entity.scheduling;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * <p>
+ * 仓库
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-12
+ */
+@Data
+public class StockSchedulingTest {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ApiModelProperty(value = "主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+    /**
+     * 排班日期
+     */
+    @ApiModelProperty(value = "排班日期")
+    private Date planDate;
+    /**
+     * 喷印人员工号
+     */
+    @ApiModelProperty(value = "喷印人员工号")
+    private String printer;
+    /**
+     * 打纸人员工号
+     */
+    @ApiModelProperty(value = "打纸人员工号")
+    private String paperMan;
+    /**
+     * 物料编码
+     */
+    @ApiModelProperty(value = "物料编码")
+    private String materialCode;
+    /**
+     * 物料长度
+     */
+    @ApiModelProperty(value = "物料长度")
+    private BigDecimal materialQuantity;
+    /**
+     * 转印纸编码
+     */
+    @ApiModelProperty(value = "转印纸编码")
+    private String paperCode;
+    /**
+     * 转印纸长度
+     */
+    @ApiModelProperty(value = "转印纸长度")
+    private BigDecimal paperQuantity;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(value = "修改时间")
+    private Date updateTime;
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+    /**
+     * 修改人
+     */
+    @ApiModelProperty(value = "修改人")
+    private String updateUser;
+
+    /**
+     * 喷印人员领料状态（0 未领取 1已领取）
+     */
+    private Integer materialStatus;
+
+    /**
+     * 打纸人员领料状态（0 未领取 1已领取）
+     */
+    private Integer paperStatus;
+
+    /**
+     * 喷印人员出入库单号
+     */
+    private Long materialFlag;
+
+    /**
+     * 打纸人员出入库单号
+     */
+    private Long paperFlag;
+
+
+}

hx-service-api/storage-api/src/main/java/com/fjhx/entity/stock/StockSchedulingTest.java

@@ -1,86 +0,0 @@
-package com.fjhx.entity.stock;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fjhx.base.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 仓库
- * </p>
- *
- * @author ${author}
- * @since 2022-08-12
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class StockSchedulingTest extends BaseEntity {
-
-
-    /**
-     * 是否删除
-     */
-    private Integer isDelete;
-
-    /**
-     * 排班日期
-     */
-    private Date planDate;
-
-    /**
-     * 喷印人员工号
-     */
-    private String printer;
-
-    /**
-     * 物料编码
-     */
-    private String materialCode;
-
-    /**
-     * 物料长度
-     */
-    private BigDecimal materialQuantity;
-
-    /**
-     * 喷印人员领料状态（0 未领取 1已领取）
-     */
-    private Integer materialStatus;
-
-    /**
-     * 喷印人员领料标识
-     */
-    private Long materialFlag;
-
-    /**
-     * 打纸人员工号
-     */
-    private String paperMan;
-
-    /**
-     * 转印纸编码
-     */
-    private String paperCode;
-
-    /**
-     * 转印纸长度
-     */
-    private BigDecimal paperQuantity;
-
-    /**
-     * 打纸人员领料状态（0 未领取 1已领取）
-     */
-    private Integer paperStatus;
-
-    /**
-     * 打纸人员领料标识
-     */
-    private Long paperFlag;
-
-
-}

hx-service-api/storage-api/src/main/java/com/fjhx/params/stock/StockSchedulingTestEx.java

@@ -1,6 +1,6 @@
 package com.fjhx.params.stock;
 
-import com.fjhx.entity.stock.StockSchedulingTest;
+import com.fjhx.entity.scheduling.StockSchedulingTest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service-api/storage-api/src/main/java/com/fjhx/params/stock/StockSchedulingTestVo.java

@@ -1,6 +1,6 @@
 package com.fjhx.params.stock;
 
-import com.fjhx.entity.stock.StockSchedulingTest;
+import com.fjhx.entity.scheduling.StockSchedulingTest;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

hx-service/basics/src/main/java/com/fjhx/BasicsApplication.java

@@ -1,11 +1,13 @@
 package com.fjhx;
 
+import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 
 /**
  * 基础出入库功能启动器
  */
+@EnableBladeFeign
 @SpringCloudApplication
 public class BasicsApplication {
 

hx-service/basics/src/main/java/com/fjhx/mapper/StockExMapper.xml

@@ -10,7 +10,7 @@
         t.name goodsName,
         t.code goodsCode,
         t.goodsType,
-        sj.changeQuantity quantity,
+        sj.change_quantity quantity,
         sj.create_time,
         sj.create_user
         from stock_journal sj

hx-service/basics/src/main/java/com/fjhx/service/impl/MaterialServiceExImpl.java

@@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.Material;
-import com.fjhx.service.*;
+import com.fjhx.service.ClassifyService;
+import com.fjhx.service.MaterialExService;
+import com.fjhx.service.MaterialService;
+import com.fjhx.utils.Assert;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

hx-service/storage/src/main/java/com/fjhx/scheduling/controller/SchedulingController.java

@@ -17,7 +17,7 @@
 package com.fjhx.scheduling.controller;
 
 import com.fjhx.entity.scheduling.Scheduling;
-import com.fjhx.entity.stock.StockSchedulingTest;
+import com.fjhx.entity.scheduling.StockSchedulingTest;
 import com.fjhx.scheduling.service.ISchedulingService;
 import com.fjhx.scheduling.service.StockSchedulingTestService;
 import com.fjhx.utils.HmacUtil;

hx-service/storage/src/main/java/com/fjhx/scheduling/mapper/StockSchedulingTestMapper.java

@@ -1,6 +1,6 @@
 package com.fjhx.scheduling.mapper;
 
-import com.fjhx.entity.stock.StockSchedulingTest;
+import com.fjhx.entity.scheduling.StockSchedulingTest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

hx-service/storage/src/main/java/com/fjhx/scheduling/service/StockSchedulingTestService.java

@@ -1,7 +1,7 @@
 package com.fjhx.scheduling.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.entity.stock.StockSchedulingTest;
+import com.fjhx.entity.scheduling.StockSchedulingTest;
 import com.fjhx.params.stock.StockSchedulingTestVo;
 import com.fjhx.base.BaseService;
 

hx-service/storage/src/main/java/com/fjhx/scheduling/service/impl/StockSchedulingTestServiceImpl.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.utils.WrapperUtil;
-import com.fjhx.entity.stock.StockSchedulingTest;
+import com.fjhx.entity.scheduling.StockSchedulingTest;
 import com.fjhx.params.stock.StockSchedulingTestVo;
 import com.fjhx.scheduling.mapper.StockSchedulingTestMapper;
 import com.fjhx.scheduling.service.StockSchedulingTestService;

hx-service/storage/src/main/java/com/fjhx/stock/controller/StockWaterController.java

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -90,5 +91,16 @@ public class StockWaterController {
         return R.success(result);
     }
 
+
+    /**
+     * 今日剩余在库列表
+     */
+    @PostMapping("inStockList")
+    public R inStockList(@RequestBody Map<String, String> condition) {
+        List<Map<String, Object>> result = stockWaterService.inStockList(condition);
+        return R.success(result);
+    }
+
+
 }
 

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.java

@@ -47,4 +47,7 @@ public interface StockWaterMapper extends BaseMapper<StockWater> {
     @TenantIgnore
     List<String> selectMaterialIdByHouseId(@Param("houseId") String houseId);
 
+    @TenantIgnore
+    List<Map<String, Object>> inStockList(@Param("materialCode") String materialCode);
+
 }

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockWaterMapper.xml

@@ -141,5 +141,20 @@
           and sd.StockHouseId = #{houseId}
     </select>
 
+    <select id="inStockList" resultType="java.util.Map">
+        select sd.RfidCode           rfidCode,
+               sd.Quantity           quantity,
+               sd.CreatedTime        createTime,
+               sh.Name               houseName,
+               sa.Name               areaName,
+               st.QuantityCheckState quantityCheckState
+        from stock_detail sd
+                 left join stock_house sh on sd.StockHouseId = sh.ID
+                 left join stock_area sa on sd.PlaceAreaId = sa.ID
+                 left join stock_tag st on sd.RfidCode = st.RfidCode
+        where sd.MaterialCode = #{materialCode}
+        order by sd.CreatedTime
+    </select>
+
 
 </mapper>

hx-service/storage/src/main/java/com/fjhx/stock/service/StockWaterService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.stock.StockWater;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -30,6 +31,6 @@ public interface StockWaterService extends BaseService<StockWater> {
 
     Page<Map<String, Object>> remainingTodayPage(Map<String, String> condition);
 
-
+    List<Map<String, Object>> inStockList(Map<String, String> condition);
 
 }

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockWaterServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.stock.StockWater;
 import com.fjhx.stock.mapper.StockWaterMapper;
 import com.fjhx.stock.service.StockWaterService;
+import com.fjhx.utils.Assert;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 
@@ -476,6 +477,28 @@ public class StockWaterServiceImpl extends ServiceImpl<StockWaterMapper, StockWa
         return page;
     }
 
+    @Override
+    public List<Map<String, Object>> inStockList(Map<String, String> condition) {
+        String materialCode = condition.get("materialCode");
+        Assert.notEmpty(materialCode, "物料编码不能为空");
+
+        List<Map<String, Object>> list = baseMapper.inStockList(materialCode);
+
+        if (list.size() == 0) {
+            return list;
+        }
+
+        Date date = new Date();
+
+        for (Map<String, Object> map : list) {
+            Date createTime = (Date) map.get("createTime");
+            map.put("createTime", DateUtil.format(createTime, "yyyy-MM-dd"));
+            map.put("inStockTime", DateUtil.betweenDay(date, createTime, true));
+        }
+
+        return list;
+    }
+
     private QueryWrapper<?> createPickingWrapper(Map<String, String> condition) {
         QueryWrapper<?> wrapper = WrapperUtil.init(condition)
                 .periodOfTime("sw.CreatedTime") // 时间段查询