杰生重构

hx-common/code-generator/src/main/java/com/fjhx/modular/StorageRestructure.java

@@ -12,7 +12,7 @@ public class StorageRestructure {
         CodeGenerator.MODULAR_NAME = "storage-restructure";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "water_back_details";
+        CodeGenerator.INCLUDE = "water_transfer_details";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

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

@@ -0,0 +1,73 @@
+package com.fjhx.entity.water;
+
+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.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-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WaterTransfer extends StorageBaseEntity {
+
+
+    /**
+     * 提交数量
+     */
+    private Integer number;
+
+    /**
+     * 提交米数
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 复核状态（0未复核 1已复合）
+     */
+    private Integer status;
+
+    /**
+     * 物料id
+     */
+    private Long materialId;
+
+    /**
+     * 接收人id
+     */
+    private Long receiveId;
+
+    /**
+     * 审核人id
+     */
+    private Long checkerId;
+
+    /**
+     * 审核时间
+     */
+    private Date checkerTime;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+    private String oldId;
+
+
+}

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

@@ -0,0 +1,62 @@
+package com.fjhx.entity.water;
+
+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-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WaterTransferDetails extends StorageBaseEntity {
+
+
+    /**
+     * 转仓id
+     */
+    private Long waterTransferId;
+
+    /**
+     * 物料id
+     */
+    private Long materialId;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 复合之前的数量
+     */
+    private BigDecimal oldQuantity;
+
+    /**
+     * 0 未复核 1已复核
+     */
+    private Integer status;
+
+    /**
+     * 逻辑删除 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/water/WaterTransferDetailsEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.water;
+
+import com.fjhx.entity.water.WaterTransferDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 转仓明细
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WaterTransferDetailsEx extends WaterTransferDetails {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.params.water;
+
+import com.fjhx.entity.water.WaterTransferDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 转仓明细
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WaterTransferDetailsVo extends WaterTransferDetails {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.params.water;
+
+import com.fjhx.entity.water.WaterTransfer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 转仓
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WaterTransferEx extends WaterTransfer {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.params.water;
+
+import com.fjhx.entity.water.WaterTransfer;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 转仓
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WaterTransferVo extends WaterTransfer {
+
+}

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

@@ -1,18 +1,10 @@
 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.WaterBackDetails;
-import com.fjhx.params.water.WaterBackDetailsVo;
 import com.fjhx.service.water.WaterBackDetailsService;
 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>
  * 退料明细 前端控制器

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

@@ -0,0 +1,56 @@
+package com.fjhx.controller.water;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.water.WaterTransfer;
+import com.fjhx.params.water.WaterTransferVo;
+import com.fjhx.service.water.WaterTransferService;
+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>
+ * 转仓 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+@RestController
+@RequestMapping("/waterTransfer")
+public class WaterTransferController {
+
+    @Autowired
+    private WaterTransferService waterTransferService;
+
+    @PostMapping("/page")
+    public R page(@RequestBody Map<String, String> condition) {
+        Page<WaterTransfer> result = waterTransferService.getPage(condition);
+        return R.success(result);
+    }
+
+    @PostMapping("/add")
+    public R add(@RequestBody WaterTransferVo waterTransferVo) {
+        waterTransferService.add(waterTransferVo);
+        return R.success();
+    }
+
+    @PostMapping("/edit")
+    public R edit(@RequestBody WaterTransferVo waterTransferVo) {
+        waterTransferService.edit(waterTransferVo);
+        return R.success();
+    }
+
+    @PostMapping("/delete")
+    public R delete(@RequestBody WaterTransferVo waterTransferVo) {
+        waterTransferService.delete(waterTransferVo);
+        return R.success();
+    }
+
+}
+

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

@@ -0,0 +1,24 @@
+package com.fjhx.controller.water;
+
+import com.fjhx.service.water.WaterTransferDetailsService;
+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-10-28
+ */
+@RestController
+@RequestMapping("/waterTransferDetails")
+public class WaterTransferDetailsController {
+
+    @Autowired
+    private WaterTransferDetailsService waterTransferDetailsService;
+
+}
+

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

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.water;
+
+import com.fjhx.entity.water.WaterTransferDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 转仓明细 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+public interface WaterTransferDetailsMapper extends BaseMapper<WaterTransferDetails> {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterTransferDetailsMapper.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.water.WaterTransferDetailsMapper">
+
+</mapper>

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

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.water;
+
+import com.fjhx.entity.water.WaterTransfer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 转仓 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+public interface WaterTransferMapper extends BaseMapper<WaterTransfer> {
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/mapper/water/WaterTransferMapper.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.water.WaterTransferMapper">
+
+</mapper>

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

@@ -1,12 +1,7 @@
 package com.fjhx.service.water;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.StorageBaseService;
 import com.fjhx.entity.water.WaterBackDetails;
-import com.fjhx.params.water.WaterBackDetailsVo;
-import com.fjhx.base.BaseService;
-
-import java.util.Map;
 
 /**
  * <p>
@@ -18,12 +13,4 @@ import java.util.Map;
  */
 public interface WaterBackDetailsService extends StorageBaseService<WaterBackDetails> {
 
-    Page<WaterBackDetails> getPage(Map<String, String> condition);
-
-    void add(WaterBackDetailsVo waterBackDetailsVo);
-
-    void edit(WaterBackDetailsVo waterBackDetailsVo);
-
-    void delete(WaterBackDetailsVo waterBackDetailsVo);
-
 }

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

@@ -0,0 +1,16 @@
+package com.fjhx.service.water;
+
+import com.fjhx.base.StorageBaseService;
+import com.fjhx.entity.water.WaterTransferDetails;
+
+/**
+ * <p>
+ * 转仓明细 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+public interface WaterTransferDetailsService extends StorageBaseService<WaterTransferDetails> {
+
+}

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

@@ -0,0 +1,28 @@
+package com.fjhx.service.water;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.water.WaterTransfer;
+import com.fjhx.params.water.WaterTransferVo;
+import com.fjhx.base.StorageBaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 转仓 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+public interface WaterTransferService extends StorageBaseService<WaterTransfer> {
+
+    Page<WaterTransfer> getPage(Map<String, String> condition);
+
+    void add(WaterTransferVo waterTransferVo);
+
+    void edit(WaterTransferVo waterTransferVo);
+
+    void delete(WaterTransferVo waterTransferVo);
+
+}

hx-service/storage-restructure/src/main/java/com/fjhx/service/water/impl/WaterBackDetailsServiceImpl.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.WaterBackDetails;
-import com.fjhx.params.water.WaterBackDetailsVo;
 import com.fjhx.mapper.water.WaterBackDetailsMapper;
 import com.fjhx.service.water.WaterBackDetailsService;
-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 WaterBackDetailsServiceImpl extends ServiceImpl<WaterBackDetailsMapper, WaterBackDetails> implements WaterBackDetailsService {
 
-    @Override
-    public Page<WaterBackDetails> getPage(Map<String, String> condition) {
-
-        QueryWrapper<WaterBackDetails> wrapper = Wrappers.query();
-
-        WrapperUtil.init(condition, wrapper)
-                .createTimeDesc();
-
-        Page<WaterBackDetails> page = page(condition, wrapper);
-        return page;
-    }
-
-    @Override
-    public void add(WaterBackDetailsVo waterBackDetailsVo) {
-        save(waterBackDetailsVo);
-    }
-
-    @Override
-    public void edit(WaterBackDetailsVo waterBackDetailsVo) {
-        updateById(waterBackDetailsVo);
-    }
-
-    @Override
-    public void delete(WaterBackDetailsVo waterBackDetailsVo) {
-        removeById(waterBackDetailsVo.getId());
-    }
-
 }

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

@@ -0,0 +1,20 @@
+package com.fjhx.service.water.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.entity.water.WaterTransferDetails;
+import com.fjhx.mapper.water.WaterTransferDetailsMapper;
+import com.fjhx.service.water.WaterTransferDetailsService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 转仓明细 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+@Service
+public class WaterTransferDetailsServiceImpl extends ServiceImpl<WaterTransferDetailsMapper, WaterTransferDetails> implements WaterTransferDetailsService {
+
+}

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

@@ -0,0 +1,54 @@
+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.fjhx.entity.water.WaterTransfer;
+import com.fjhx.params.water.WaterTransferVo;
+import com.fjhx.mapper.water.WaterTransferMapper;
+import com.fjhx.service.water.WaterTransferService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 转仓 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-10-28
+ */
+@Service
+public class WaterTransferServiceImpl extends ServiceImpl<WaterTransferMapper, WaterTransfer> implements WaterTransferService {
+
+    @Override
+    public Page<WaterTransfer> getPage(Map<String, String> condition) {
+
+        QueryWrapper<WaterTransfer> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .createTimeDesc();
+
+        Page<WaterTransfer> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(WaterTransferVo waterTransferVo) {
+        save(waterTransferVo);
+    }
+
+    @Override
+    public void edit(WaterTransferVo waterTransferVo) {
+        updateById(waterTransferVo);
+    }
+
+    @Override
+    public void delete(WaterTransferVo waterTransferVo) {
+        removeById(waterTransferVo.getId());
+    }
+
+}