测试接口

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

@@ -55,7 +55,7 @@ public class CodeGenerator {
         String entityChildren = "/hx-service-api/" + MODULAR_NAME.replace("_", "-") + "-api";
 
         //  业务所在模块
-        String children = "/" + SERVICE_PATH + " / " + MODULAR_NAME.replace(" _ ", " - ");
+        String children = "/" + SERVICE_PATH + "/" + MODULAR_NAME.replace("_", "-");
 
         // 生成的包路径
         String parent = "com.fjhx";

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

@@ -0,0 +1,86 @@
+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

@@ -0,0 +1,17 @@
+package com.fjhx.params.stock;
+
+import com.fjhx.entity.stock.StockSchedulingTest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 仓库
+ *
+ * @author ${author}
+ * @since 2022-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockSchedulingTestEx extends StockSchedulingTest {
+
+}

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

@@ -0,0 +1,17 @@
+package com.fjhx.params.stock;
+
+import com.fjhx.entity.stock.StockSchedulingTest;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 仓库
+ *
+ * @author ${author}
+ * @since 2022-08-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class StockSchedulingTestVo extends StockSchedulingTest {
+
+}

hx-service/basics/src/main/java/com/fjhx/controller/WarehouseController.java

@@ -40,7 +40,6 @@ public class WarehouseController {
         return R.success(result);
     }
 
-
     @PostMapping("/add")
     public R add(@RequestBody Warehouse warehouse) {
         warehouseService.addOrEdit(warehouse);

hx-service/storage-restructure/src/main/java/com/fjhx/service/stock/impl/StockAreaServiceImpl.java → hx-service/storage-restructure/src/main/java/com/fjhx/scheduling/service/impl/StockAreaServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.service.stock.impl;
+package com.fjhx.scheduling.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

hx-service/storage-restructure/src/main/java/com/fjhx/service/stock/impl/StockHouseServiceImpl.java → hx-service/storage-restructure/src/main/java/com/fjhx/scheduling/service/impl/StockHouseServiceImpl.java

@@ -1,4 +1,4 @@
-package com.fjhx.service.stock.impl;
+package com.fjhx.scheduling.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

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

@@ -17,7 +17,9 @@
 package com.fjhx.scheduling.controller;
 
 import com.fjhx.entity.scheduling.Scheduling;
+import com.fjhx.entity.stock.StockSchedulingTest;
 import com.fjhx.scheduling.service.ISchedulingService;
+import com.fjhx.scheduling.service.StockSchedulingTestService;
 import com.fjhx.utils.HmacUtil;
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;
@@ -41,6 +43,7 @@ import java.util.Date;
 public class SchedulingController extends BladeController {
 
     private final ISchedulingService schedulingService;
+    private final StockSchedulingTestService stockSchedulingTestService;
 
     /**
      * 新增
@@ -55,4 +58,17 @@ public class SchedulingController extends BladeController {
         return R.status(schedulingService.save(scheduling));
     }
 
+    /**
+     * 新增
+     */
+    @PostMapping("/test/save")
+    public R testSave(@RequestBody StockSchedulingTest scheduling, @RequestHeader("Authority") String authority, @RequestHeader("date") String date) {
+        if (!StringUtil.equals(HmacUtil.encrypt("fjhx" + date, "fjhx@2012"), authority)) {
+            return R.fail("无权限");
+        }
+        scheduling.setCreateTime(new Date());
+        scheduling.setId(null);
+        return R.status(stockSchedulingTestService.save(scheduling));
+    }
+
 }

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

@@ -0,0 +1,16 @@
+package com.fjhx.scheduling.mapper;
+
+import com.fjhx.entity.stock.StockSchedulingTest;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 仓库 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-12
+ */
+public interface StockSchedulingTestMapper extends BaseMapper<StockSchedulingTest> {
+
+}

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

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

@@ -0,0 +1,28 @@
+package com.fjhx.scheduling.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.stock.StockSchedulingTest;
+import com.fjhx.params.stock.StockSchedulingTestVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-12
+ */
+public interface StockSchedulingTestService extends BaseService<StockSchedulingTest> {
+
+    Page<StockSchedulingTest> getPage(Map<String, String> condition);
+
+    void add(StockSchedulingTestVo stockSchedulingTestVo);
+
+    void edit(StockSchedulingTestVo stockSchedulingTestVo);
+
+    void delete(StockSchedulingTestVo stockSchedulingTestVo);
+
+}

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

@@ -0,0 +1,54 @@
+package com.fjhx.scheduling.service.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.stock.StockSchedulingTest;
+import com.fjhx.params.stock.StockSchedulingTestVo;
+import com.fjhx.scheduling.mapper.StockSchedulingTestMapper;
+import com.fjhx.scheduling.service.StockSchedulingTestService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 仓库 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-08-12
+ */
+@Service
+public class StockSchedulingTestServiceImpl extends ServiceImpl<StockSchedulingTestMapper, StockSchedulingTest> implements StockSchedulingTestService {
+
+    @Override
+    public Page<StockSchedulingTest> getPage(Map<String, String> condition) {
+
+        QueryWrapper<StockSchedulingTest> wrapper = Wrappers.query();
+
+        WrapperUtil.init(condition, wrapper)
+                .createTimeDesc();
+
+        Page<StockSchedulingTest> page = page(condition, wrapper);
+        return page;
+    }
+
+    @Override
+    public void add(StockSchedulingTestVo stockSchedulingTestVo) {
+        save(stockSchedulingTestVo);
+    }
+
+    @Override
+    public void edit(StockSchedulingTestVo stockSchedulingTestVo) {
+        updateById(stockSchedulingTestVo);
+    }
+
+    @Override
+    public void delete(StockSchedulingTestVo stockSchedulingTestVo) {
+        removeById(stockSchedulingTestVo.getId());
+    }
+
+}