杰生重构

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/constants/InOutTypeConstant.java

@@ -0,0 +1,18 @@
+package com.fjhx.constants;
+
+/**
+ * 出入库类型
+ */
+public interface InOutTypeConstant {
+
+    /**
+     * 出库
+     */
+    Integer OUT = 0;
+
+    /**
+     * 入库
+     */
+    Integer IN = 1;
+
+}

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

@@ -0,0 +1,62 @@
+package com.fjhx.entity.stock;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.fjhx.base.StorageBaseEntity;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 库存表
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class Stock extends StorageBaseEntity {
+
+
+    /**
+     * 物料id
+     */
+    private Long materialId;
+
+    /**
+     * 件数
+     */
+    private Integer number;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 盘点id
+     */
+    private Long checkId;
+
+    /**
+     * 盘点状态（0未发起，1已发起）
+     */
+    private Integer checkStatus;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+    private String oldId;
+
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.params.stock;
+
+import com.fjhx.entity.stock.Stock;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 库存表
+ *
+ * @author ${author}
+ * @since 2022-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockEx extends Stock {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.params.stock;
+
+import com.fjhx.entity.stock.Stock;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 库存表
+ *
+ * @author ${author}
+ * @since 2022-09-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockVo extends Stock {
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/params/water/WaterVo.java

@@ -4,6 +4,8 @@ import com.fjhx.entity.water.Water;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 流水表
  *
@@ -14,4 +16,6 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class WaterVo extends Water {
 
+    private List<Long> waterTagIdList;
+
 }

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

@@ -0,0 +1,24 @@
+package com.fjhx.controller.stock;
+
+import com.fjhx.service.stock.StockService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 库存表 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-22
+ */
+@RestController
+@RequestMapping("/stock")
+public class StockController {
+
+    @Autowired
+    private StockService stockService;
+
+}
+

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

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.stock;
+
+import com.fjhx.entity.stock.Stock;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 库存表 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-22
+ */
+public interface StockMapper extends BaseMapper<Stock> {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fjhx.mapper.stock.StockMapper">
+
+</mapper>

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterTagMapper.xml

@@ -39,7 +39,8 @@
                m.Spec materialSpec,
                wt.quantity,
                m.unit materialUnit,
-               wt.in_house
+               wt.in_house,
+               wt.stock_house_id
         from water_tag wt
                  left join material m on wt.material_id = m.id
         where wt.rfid_code = #{rfidCode}

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

@@ -0,0 +1,16 @@
+package com.fjhx.service.stock;
+
+import com.fjhx.base.StorageBaseService;
+import com.fjhx.entity.stock.Stock;
+
+/**
+ * <p>
+ * 库存表 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-22
+ */
+public interface StockService extends StorageBaseService<Stock> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fjhx.service.stock.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.stock.Stock;
+import com.fjhx.mapper.stock.StockMapper;
+import com.fjhx.service.stock.StockService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 库存表 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-09-22
+ */
+@Service
+public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements StockService {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/WaterDetailService.java

@@ -1,11 +1,11 @@
 package com.fjhx.service.water;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.water.WaterDetail;
-import com.fjhx.params.water.WaterDetailVo;
+import com.fjhx.entity.water.WaterTag;
 import com.fjhx.base.StorageBaseService;
+import com.fjhx.params.water.WaterVo;
 
-import java.util.Map;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +17,6 @@ import java.util.Map;
  */
 public interface WaterDetailService extends StorageBaseService<WaterDetail> {
 
+    void add(WaterVo waterVo, List<WaterTag> waterTagList);
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterDetailServiceImpl.java

@@ -2,10 +2,15 @@ package com.fjhx.service.water.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.water.WaterDetail;
+import com.fjhx.entity.water.WaterTag;
 import com.fjhx.mapper.water.WaterDetailMapper;
+import com.fjhx.params.water.WaterVo;
 import com.fjhx.service.water.WaterDetailService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 流水明细表 服务实现类
@@ -17,4 +22,28 @@ import org.springframework.stereotype.Service;
 @Service
 public class WaterDetailServiceImpl extends ServiceImpl<WaterDetailMapper, WaterDetail> implements WaterDetailService {
 
+    @Override
+    public void add(WaterVo waterVo, List<WaterTag> waterTagList) {
+
+        // 添加标签明细
+        List<WaterDetail> waterDetailList = new ArrayList<>();
+        for (WaterTag waterTag : waterTagList) {
+            WaterDetail waterDetail = new WaterDetail();
+            waterDetail.setWaterId(waterVo.getId());
+            waterDetail.setWaterBatchId(waterTag.getWaterBatchId());
+            waterDetail.setWaterTagId(waterTag.getId());
+            waterDetail.setOperUserId(waterVo.getOperUserId());
+            waterDetail.setMaterialId(waterTag.getMaterialId());
+            waterDetail.setQuantity(waterTag.getQuantity());
+            waterDetail.setQrCode(waterTag.getQrCode());
+            waterDetail.setRfidCode(waterTag.getRfidCode());
+            waterDetail.setPrice(waterTag.getPrice());
+            waterDetail.setType(waterVo.getType());
+            waterDetail.setDevice(waterVo.getDevice());
+            waterDetailList.add(waterDetail);
+        }
+
+        saveBatch(waterDetailList);
+    }
+
 }

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterServiceImpl.java

@@ -1,11 +1,24 @@
 package com.fjhx.service.water.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.constants.InOutTypeConstant;
+import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.water.Water;
+import com.fjhx.entity.water.WaterTag;
+import com.fjhx.enums.InTypeEnum;
+import com.fjhx.enums.OutTypeEnum;
 import com.fjhx.mapper.water.WaterMapper;
 import com.fjhx.params.water.WaterVo;
+import com.fjhx.service.water.WaterDetailService;
 import com.fjhx.service.water.WaterService;
+import com.fjhx.service.water.WaterTagService;
+import com.fjhx.utils.Assert;
+import org.springblade.core.log.exception.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * <p>
@@ -18,9 +31,87 @@ import org.springframework.stereotype.Service;
 @Service
 public class WaterServiceImpl extends ServiceImpl<WaterMapper, Water> implements WaterService {
 
+    @Autowired
+    private WaterDetailService waterDetailService;
+
+    @Autowired
+    private WaterTagService waterTagService;
+
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(WaterVo waterVo) {
+        Integer type = waterVo.getType();
+        List<Long> waterTagIdList = waterVo.getWaterTagIdList();
+
+        Assert.notEmpty(waterVo.getStockHouseId(), "仓库id不能为空");
+        Assert.notEmpty(waterVo.getOperUserId(), "操作人id不能为空");
+        Assert.notEmpty(type, "库存变更类型不能为空");
+        Assert.notEmpty(waterVo.getDevice(), "出入库设备类型不能为空");
+        Assert.notEmpty(waterVo.getWaterTagIdList(), "标签id数组不能为空");
+
+        // 出库或入库类型
+        Integer inOutType = getInOutType(type);
+
+        // 入库标签id查询标签列表
+        List<WaterTag> waterTagList = waterTagService.listByIds(waterTagIdList);
+        Assert.eqTrue(waterTagIdList.size() != waterTagList.size(), "存在未知标签id");
+
+        // TODO 一体机出库时，判断是否异常出库
+        setErrorOutStatus(waterVo);
+
+        // 添加流水
+        save(waterVo);
+
+        // 添加流水详情
+        waterDetailService.add(waterVo, waterTagList);
+
+        // 更新库存
+
+
+    }
+
+//    // 出入库处理
+//        if (InTypeEnum.get(type) != null) {
+//        inHandel(waterVo);
+//    } else {
+//        outHandel(waterVo);
+//    }
+
+    /**
+     * 出库类型处理
+     *
+     * @param waterVo
+     */
+    private void outHandel(WaterVo waterVo) {
+
+    }
+
+    /**
+     * 入库类型处理
+     *
+     * @param waterVo
+     */
+    private void inHandel(WaterVo waterVo) {
+
+    }
+
+    /**
+     * TODO 一体机出库时，判断是否异常出库
+     *
+     * @param waterVo
+     */
+    private void setErrorOutStatus(WaterVo waterVo) {
+        waterVo.setErrorOutStatus(StatusConstant.NO);
+    }
 
+    private Integer getInOutType(Integer type) {
+        if (InTypeEnum.get(type) != null) {
+            return InOutTypeConstant.IN;
+        } else if (OutTypeEnum.get(type) != null) {
+            return InOutTypeConstant.OUT;
+        } else {
+            throw new ServiceException("未知出入库类型");
+        }
     }
 
 }

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

@@ -54,12 +54,12 @@
     </select>
 
     <select id="getTransferBackList" resultType="java.util.Map">
-        select std.quantity  changeNum,
-               st.check_time createTime,
-               m.Name        materialName,
-               m.Price       price,
-               m.Width       width,
-               uu.JobNo      jobNo
+        select std.quantity   changeNum,
+               st.submit_time createTime,
+               m.Name         materialName,
+               m.Price        price,
+               m.Width        width,
+               uu.JobNo       jobNo
         from stock_transfer st
                  left join stock_transfer_details std on st.id = std.stock_transfer_id
                  left join material m on st.material_id = m.id
@@ -69,12 +69,12 @@
     </select>
 
     <select id="getTransferPickingList" resultType="java.util.Map">
-        select std.quantity  changeNum,
-               st.check_time createTime,
-               m.Name        materialName,
-               m.Price       price,
-               m.Width       width,
-               uu.JobNo      jobNo
+        select std.quantity   changeNum,
+               st.submit_time createTime,
+               m.Name         materialName,
+               m.Price        price,
+               m.Width        width,
+               uu.JobNo       jobNo
         from stock_transfer st
                  left join stock_transfer_details std on st.id = std.stock_transfer_id
                  left join material m on st.material_id = m.id

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

@@ -3,7 +3,6 @@ package com.fjhx.stock.service.impl;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.constants.StatusConstant;
@@ -118,7 +117,6 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                     StockBackPlanDetails stockBackPlanDetails =
                             createStockBackPlanDetails(item.getJobNo(), item.getPlanMaterial(), item.getPlanTime());
                     stockBackPlanDetails.setQuantity(item.getQuantity());
-
                     return stockBackPlanDetails;
                 }
         ));
@@ -126,21 +124,17 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
         stockBackPlanDetailsService.remove(Wrappers.<StockBackPlanDetails>lambdaQuery()
                 .between(StockBackPlanDetails::getPlanTime, beginDate, endDate));
 
-        // 领料统计
-        QueryWrapper<Object> pickingWrapper = Wrappers.query()
+        // 查询出库
+        List<Map<String, Object>> pickingList = baseMapper.getWater(Wrappers.query()
                 .ge("swd.CreatedTime", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
                 .in("swd.StockChangeType", 20, 23)
                 .eq("uu.IsDelete", 0)
                 .in("uu.DepartmentID", "A007", "A008", "A012")
                 .likeRight("m.Code", "01.")
-                .isNotNull("uu.JobNo");
-
-        // 查询出库
-        List<Map<String, Object>> pickingList = baseMapper.getWater(pickingWrapper);
-
+                .isNotNull("uu.JobNo"));
         // 转仓
         List<Map<String, Object>> transferPickingList = baseMapper.getTransferPickingList(Wrappers.query()
-                .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
+                .ge("st.submit_time", DateUtil.format(beginDate, "yyyy-MM-dd 7:30:00"))
                 .eq("st.status", StatusConstant.YES)
         );
         pickingList.addAll(transferPickingList);
@@ -155,7 +149,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             int m = Integer.parseInt(DateUtil.format(createTime, "m"));
             // 小于7点30算前一日
             if (h < 7 || (h == 7 && m <= 30)) {
-                DateUtil.offsetDay(createTime, -1);
+                createTime = DateUtil.offsetDay(createTime, -1);
             }
 
             // 排班时间
@@ -202,7 +196,7 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
 
         // 转仓
         List<Map<String, Object>> transferBackList = baseMapper.getTransferBackList(Wrappers.query()
-                .ge("st.check_time", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
+                .ge("st.submit_time", DateUtil.format(beginDate, "yyyy-MM-dd 10:00:00"))
                 .eq("st.status", StatusConstant.YES)
         );
         backList.addAll(transferBackList);
@@ -213,12 +207,11 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
             Date createTime = (Date) map.get("createTime");
 
             int h = Integer.parseInt(DateUtil.format(createTime, "H"));
-//            int m = Integer.parseInt(DateUtil.format(createTime, "m"));
+            // int m = Integer.parseInt(DateUtil.format(createTime, "m"));
             // 小于10点算前一日
             if (h < 10) {
-                DateUtil.offsetDay(createTime, -1);
+                createTime = DateUtil.offsetDay(createTime, -1);
             }
-
             // 排班时间
             Date planDate = DateUtil.beginOfDay(createTime);
             // 工号
@@ -255,10 +248,9 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
         }
 
         // 物料修正
-        QueryWrapper<Object> correctWrapper = Wrappers.query()
+        List<Map<String, Object>> correctList = baseMapper.getCorrect(Wrappers.query()
                 .gt("sbc.correct_time", DateUtil.format(beginDate, "yyyy-MM-dd 00:00:00"))
-                .isNotNull("uu.JobNo");
-        List<Map<String, Object>> correctList = baseMapper.getCorrect(correctWrapper);
+                .isNotNull("uu.JobNo"));
         for (Map<String, Object> map : correctList) {
             // 出库时间
             Date createTime = (Date) map.get("createTime");
@@ -277,7 +269,6 @@ public class StockBackPlanServiceImpl extends ServiceImpl<StockBackPlanMapper, S
                 stockBackPlanDetails = createStockBackPlanDetails(jobNo, materialName, planDate);
                 stockBackPlanMap.put(jobNo + materialName + planDate, stockBackPlanDetails);
             }
-
             // 金额
             stockBackPlanDetails.setCorrectArea(stockBackPlanDetails.getCorrectArea().add(correctArea));
         }

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

@@ -252,11 +252,11 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
 
         String beginTimeStr = condition.get("beginTime");
         Assert.notEmpty(beginTimeStr, "开始时间不能为空");
-        Date beginTime = DateUtil.offsetMinute(DateUtil.beginOfDay(DateUtil.parse(beginTimeStr)), 750);
+        Date beginTime = DateUtil.beginOfDay(DateUtil.parse(beginTimeStr));
 
         String endTimeStr = condition.get("endTime");
         Assert.notEmpty(endTimeStr, "结束时间不能为空");
-        Date endTime = DateUtil.offsetMinute(DateUtil.endOfDay(DateUtil.parse(endTimeStr)), 750);
+        Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
 
         List<Map<String, Object>> result = userList();
 
@@ -307,11 +307,11 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
 
         String beginTimeStr = condition.get("beginTime");
         Assert.notEmpty(beginTimeStr, "开始时间不能为空");
-        Date beginTime = DateUtil.offsetMinute(DateUtil.beginOfDay(DateUtil.parse(beginTimeStr)), 750);
+        Date beginTime = DateUtil.beginOfDay(DateUtil.parse(beginTimeStr));
 
         String endTimeStr = condition.get("endTime");
         Assert.notEmpty(endTimeStr, "结束时间不能为空");
-        Date endTime = DateUtil.offsetMinute(DateUtil.endOfDay(DateUtil.parse(endTimeStr)), 750);
+        Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
 
         List<StockBackPlanDetails> list = stockBackPlanDetailsService.list(
                 Wrappers.<StockBackPlanDetails>lambdaQuery()
@@ -341,11 +341,11 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
 
         String beginTimeStr = condition.get("beginTime");
         Assert.notEmpty(beginTimeStr, "开始时间不能为空");
-        Date beginTime = DateUtil.offsetMinute(DateUtil.beginOfDay(DateUtil.parse(beginTimeStr)), 750);
+        Date beginTime = DateUtil.beginOfDay(DateUtil.parse(beginTimeStr));
 
         String endTimeStr = condition.get("endTime");
         Assert.notEmpty(endTimeStr, "结束时间不能为空");
-        Date endTime = DateUtil.offsetMinute(DateUtil.endOfDay(DateUtil.parse(endTimeStr)), 750);
+        Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
 
         return baseMapper.selectPickingPage(createPage(condition), jobNo, beginTime, endTime);
     }

hx-service/storage/src/main/java/com/fjhx/task/controller/ScheduleTaskController.java

@@ -56,7 +56,7 @@ public class ScheduleTaskController {
      * 统计排班数据
      */
     @Scheduled(cron = "0 0 10,22 * * ?")
-//    @Scheduled(cron = "0 * * * * ?")
+//    @Scheduled(cron = "0 36 * * * ?")
     private void statisticsScheduleDateTask() {
         if (BladeApplication.isLocalDev()) {
             return;