杰生重构

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/Water.java

@@ -7,8 +7,6 @@ import com.fjhx.base.StorageBaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-
 /**
  * <p>
  * 流水表
@@ -27,21 +25,11 @@ public class Water extends StorageBaseEntity {
     private Long stockHouseId;
 
     /**
-     * 批次id
-     */
-    private Long waterBatchId;
-
-    /**
      * 操作人
      */
     private Long operUserId;
 
     /**
-     * 物料id
-     */
-    private Long materialId;
-
-    /**
      * 库存变更类型
      * <p>
      * 6: 库存初始化
@@ -51,12 +39,13 @@ public class Water extends StorageBaseEntity {
     private Integer type;
 
     /**
-     * 合计数量
+     * 出入库设备 （0一体机，1手持机，2web端）
      */
-    private BigDecimal totalQuantity;
+    private Integer device;
 
     /**
      * 异常出库是否已处理 （0否，1是）
+     * 一体机
      */
     private Integer errorOutStatus;
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/entity/water/WaterDetail.java

@@ -21,11 +21,10 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 public class WaterDetail extends StorageBaseEntity {
 
-
     /**
      * 流水id
      */
-    private Long stockWaterId;
+    private Long waterId;
 
     /**
      * 批次id
@@ -35,7 +34,7 @@ public class WaterDetail extends StorageBaseEntity {
     /**
      * 标签id
      */
-    private Long stockTagId;
+    private Long waterTagId;
 
     /**
      * 操作人
@@ -68,7 +67,11 @@ public class WaterDetail extends StorageBaseEntity {
     private BigDecimal price;
 
     /**
-     * 库存变更类型 （6库存初始化，10入库，11盘盈，12数量添加修正，13补入库，14标签损坏入库，15归还入库，16现场回仓，17调仓入库，20出库，21盘亏，22数量减少修正，23补出库，24绑定错误，25标签损坏出库，26退货出库，27报废出库，28调仓出库）
+     * 库存变更类型
+     * <p>
+     * 6: 库存初始化
+     * 10:入库， 11:盘盈， 12:数量添加修正， 13:补入库， 14:标签损坏入库，15:归还入库，    16:现场回仓， 17:调仓入库
+     * 20:出库， 21:盘亏， 22:数量减少修正， 23:补出库， 24:绑定错误，   25:标签损坏出库， 26:退货出库， 27:报废出库， 28:调仓出库
      */
     private Integer type;
 

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/enums/DeviceTypeEnum.java

@@ -0,0 +1,56 @@
+package com.fjhx.enums;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 设备类型
+ */
+@Getter
+public enum DeviceTypeEnum {
+
+    ISSUE(20, "出库"),
+    INVENTORY_LOSS(21, "盘亏"),
+    CORRECT(22, "数量减少修正");
+
+    private final Integer type;
+    private final String name;
+
+    private static final HashMap<Integer, DeviceTypeEnum> map = new HashMap<>();
+    private static final List<Integer> list = new ArrayList<>();
+
+    DeviceTypeEnum(Integer type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    static {
+        for (DeviceTypeEnum value : DeviceTypeEnum.values()) {
+            map.put(value.getType(), value);
+            list.add(value.getType());
+        }
+    }
+
+    /**
+     * 根据type获取枚举
+     */
+    public static DeviceTypeEnum get(Integer type) {
+        return map.get(type);
+    }
+
+    /**
+     * 根据type值获取枚举
+     */
+    public static String getName(Integer type) {
+        return map.get(type).getName();
+    }
+
+    public static List<Integer> list() {
+        return list;
+    }
+
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/enums/FlowStatusEnum.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 import java.util.HashMap;
 
 /**
- * 物料属性
+ * 审批状态
  */
 @Getter
 public enum FlowStatusEnum {

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/enums/InTypeEnum.java

@@ -0,0 +1,61 @@
+package com.fjhx.enums;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 入库类型
+ */
+@Getter
+public enum InTypeEnum {
+
+    WAREHOUSING(10, "入库"),
+    INVENTORY_SURPLUS(11, "盘盈"),
+    CORRECT(12, "数量添加修正"),
+    SUPPLEMENT(13, "补入库"),
+    TAG_DAMAGE(14, "标签损坏入库"),
+    BACK(15, "归还入库"),
+    RETURN_WAREHOUSE(16, "现场回仓"),
+    WAREHOUSE_ADJUSTMENT(17, "调仓入库");
+
+    private final Integer type;
+    private final String name;
+
+    private static final HashMap<Integer, InTypeEnum> map = new HashMap<>();
+    private static final List<Integer> list = new ArrayList<>();
+
+    InTypeEnum(Integer type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    static {
+        for (InTypeEnum value : InTypeEnum.values()) {
+            map.put(value.getType(), value);
+            list.add(value.getType());
+        }
+    }
+
+    /**
+     * 根据type获取枚举
+     */
+    public static InTypeEnum get(Integer type) {
+        return map.get(type);
+    }
+
+    /**
+     * 根据type值获取枚举
+     */
+    public static String getName(Integer type) {
+        return map.get(type).getName();
+    }
+
+    public static List<Integer> list() {
+        return list;
+    }
+
+
+}

hx-service-api/storage-restructure-api/src/main/java/com/fjhx/enums/OutTypeEnum.java

@@ -0,0 +1,62 @@
+package com.fjhx.enums;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 出库类型
+ */
+@Getter
+public enum OutTypeEnum {
+
+    ISSUE(20, "出库"),
+    INVENTORY_LOSS(21, "盘亏"),
+    CORRECT(22, "数量减少修正"),
+    REPLENISHMENT(23, "补出库"),
+    BINDING_ERROR(24, "绑定错误"),
+    TAG_DAMAGE(25, "标签损坏出库"),
+    RETURN_ISSUE(26, "退货出库"),
+    Scrap_issue(27, "报废出库"),
+    WAREHOUSE_ADJUSTMENT(28, "调仓出库");
+
+    private final Integer type;
+    private final String name;
+
+    private static final HashMap<Integer, OutTypeEnum> map = new HashMap<>();
+    private static final List<Integer> list = new ArrayList<>();
+
+    OutTypeEnum(Integer type, String name) {
+        this.type = type;
+        this.name = name;
+    }
+
+    static {
+        for (OutTypeEnum value : OutTypeEnum.values()) {
+            map.put(value.getType(), value);
+            list.add(value.getType());
+        }
+    }
+
+    /**
+     * 根据type获取枚举
+     */
+    public static OutTypeEnum get(Integer type) {
+        return map.get(type);
+    }
+
+    /**
+     * 根据type值获取枚举
+     */
+    public static String getName(Integer type) {
+        return map.get(type).getName();
+    }
+
+    public static List<Integer> list() {
+        return list;
+    }
+
+
+}

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

@@ -1,18 +1,14 @@
 package com.fjhx.controller.water;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
-import com.fjhx.entity.water.Water;
 import com.fjhx.params.water.WaterVo;
 import com.fjhx.service.water.WaterService;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
-
 /**
  * <p>
  * 流水表 前端控制器
@@ -28,29 +24,11 @@ public class WaterController {
     @Autowired
     private WaterService waterService;
 
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition){
-        Page<Water> result = waterService.getPage(condition);
-        return R.success(result);
-    }
-
     @PostMapping("/add")
-    public R add(@RequestBody WaterVo waterVo){
+    public R add(@RequestBody WaterVo waterVo) {
         waterService.add(waterVo);
         return R.success();
     }
 
-    @PostMapping("/edit")
-    public R edit(@RequestBody WaterVo waterVo){
-        waterService.edit(waterVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody WaterVo waterVo){
-        waterService.delete(waterVo);
-        return R.success();
-    }
-
 }
 

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

@@ -28,29 +28,5 @@ public class WaterDetailController {
     @Autowired
     private WaterDetailService waterDetailService;
 
-    @PostMapping("/page")
-    public R page(@RequestBody Map<String, String> condition) {
-        Page<WaterDetail> result = waterDetailService.getPage(condition);
-        return R.success(result);
-    }
-
-    @PostMapping("/add")
-    public R add(@RequestBody WaterDetailVo waterDetailVo) {
-        waterDetailService.add(waterDetailVo);
-        return R.success();
-    }
-
-    @PostMapping("/edit")
-    public R edit(@RequestBody WaterDetailVo waterDetailVo) {
-        waterDetailService.edit(waterDetailVo);
-        return R.success();
-    }
-
-    @PostMapping("/delete")
-    public R delete(@RequestBody WaterDetailVo waterDetailVo) {
-        waterDetailService.delete(waterDetailVo);
-        return R.success();
-    }
-
 }
 

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

@@ -102,5 +102,14 @@ public class WaterTagController {
         return R.success(result);
     }
 
+    /**
+     * 通过rfid获取标签明细
+     */
+    @PostMapping("/getDetailsByRfid")
+    public R getDetailsByRfid(@RequestBody WaterTag waterTag) {
+        Map<String, Object> result = waterTagService.getDetailsByRfid(waterTag.getRfidCode());
+        return R.success(result);
+    }
+
 }
 

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

@@ -22,4 +22,6 @@ public interface WaterTagMapper extends BaseMapper<WaterTag> {
 
     Map<String, Object> getDetailsByQrCode(@Param("qrCode") String qrCode);
 
+    Map<String, Object> getDetailsByRfid(@Param("rfidCode") String rfidCode);
+
 }

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

@@ -31,4 +31,18 @@
         where wt.qr_code = #{qrCode}
     </select>
 
+    <select id="getDetailsByRfid" resultType="java.util.Map">
+        select wt.id,
+               wt.rfid_code,
+               m.code materialCode,
+               m.name materialName,
+               m.Spec materialSpec,
+               wt.quantity,
+               m.unit materialUnit,
+               wt.in_house
+        from water_tag wt
+                 left join material m on wt.material_id = m.id
+        where wt.rfid_code = #{rfidCode}
+    </select>
+
 </mapper>

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

@@ -17,12 +17,4 @@ import java.util.Map;
  */
 public interface WaterDetailService extends StorageBaseService<WaterDetail> {
 
-    Page<WaterDetail> getPage(Map<String, String> condition);
-
-    void add(WaterDetailVo waterDetailVo);
-
-    void edit(WaterDetailVo waterDetailVo);
-
-    void delete(WaterDetailVo waterDetailVo);
-
 }

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

@@ -1,11 +1,8 @@
 package com.fjhx.service.water;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.StorageBaseService;
 import com.fjhx.entity.water.Water;
 import com.fjhx.params.water.WaterVo;
-import com.fjhx.base.StorageBaseService;
-
-import java.util.Map;
 
 /**
  * <p>
@@ -17,12 +14,6 @@ import java.util.Map;
  */
 public interface WaterService extends StorageBaseService<Water> {
 
-    Page<Water> getPage(Map<String, String> condition);
-
     void add(WaterVo waterVo);
 
-    void edit(WaterVo waterVo);
-
-    void delete(WaterVo waterVo);
-
 }

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

@@ -34,4 +34,6 @@ public interface WaterTagService extends StorageBaseService<WaterTag> {
 
     Map<String, Object> getDetailsByQrCode(String qrCode);
 
+    Map<String, Object> getDetailsByRfid(String rfidCode);
+
 }

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

@@ -1,18 +1,11 @@
 package com.fjhx.service.water.impl;
 
-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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.water.WaterDetail;
-import com.fjhx.params.water.WaterDetailVo;
 import com.fjhx.mapper.water.WaterDetailMapper;
 import com.fjhx.service.water.WaterDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-
 /**
  * <p>
  * 流水明细表 服务实现类
@@ -24,31 +17,4 @@ import java.util.Map;
 @Service
 public class WaterDetailServiceImpl extends ServiceImpl<WaterDetailMapper, WaterDetail> implements WaterDetailService {
 
-    @Override
-    public Page<WaterDetail> getPage(Map<String, String> condition) {
-
-        QueryWrapper<WaterDetail> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        Page<WaterDetail> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
-    public void add(WaterDetailVo waterDetailVo) {
-        save(waterDetailVo);
-    }
-
-    @Override
-    public void edit(WaterDetailVo waterDetailVo) {
-        updateById(waterDetailVo);
-    }
-
-    @Override
-    public void delete(WaterDetailVo waterDetailVo) {
-        removeById(waterDetailVo.getId());
-    }
-
 }

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

@@ -1,18 +1,12 @@
 package com.fjhx.service.water.impl;
 
-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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.water.Water;
-import com.fjhx.params.water.WaterVo;
 import com.fjhx.mapper.water.WaterMapper;
+import com.fjhx.params.water.WaterVo;
 import com.fjhx.service.water.WaterService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.util.Map;
-
 /**
  * <p>
  * 流水表 服务实现类
@@ -25,30 +19,8 @@ import java.util.Map;
 public class WaterServiceImpl extends ServiceImpl<WaterMapper, Water> implements WaterService {
 
     @Override
-    public Page<Water> getPage(Map<String, String> condition) {
-
-        QueryWrapper<Water> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        Page<Water> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
     public void add(WaterVo waterVo) {
-        save(waterVo);
-    }
 
-    @Override
-    public void edit(WaterVo waterVo) {
-        updateById(waterVo);
-    }
-
-    @Override
-    public void delete(WaterVo waterVo) {
-        removeById(waterVo.getId());
     }
 
 }

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

@@ -167,6 +167,11 @@ public class WaterTagServiceImpl extends ServiceImpl<WaterTagMapper, WaterTag> i
         return baseMapper.getDetailsByQrCode(qrCode);
     }
 
+    @Override
+    public Map<String, Object> getDetailsByRfid(String rfidCode) {
+        return baseMapper.getDetailsByRfid(rfidCode);
+    }
+
     /**
      * 解析excel文件中的数据
      */

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