fix:完善业务

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/BulkOrderListController.java

@@ -1,4 +1,44 @@
 package org.dromara.bulk.controller;
 
-public class BulkOrderListController {
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.BulkOrderListBo;
+import org.dromara.bulk.domain.vo.BulkOrderListVo;
+import org.dromara.bulk.service.BulkOrderListService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bulkOrder/bulkOrderList")
+public class BulkOrderListController extends BaseController {
+    private final BulkOrderListService bulkOrderListService;
+
+    @SaIgnore
+    @GetMapping("/PageList")
+    public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
+        return bulkOrderListService.selectPageBulkOrderList(bulkOrderListBo, pageQuery);
+    }
+
+    @SaIgnore
+    @PostMapping()
+    public R<Void> insertBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
+        return toAjax(bulkOrderListService.insertBulkOrder(bulkOrderListBo));
+    }
+
+    @SaIgnore
+    @PutMapping()
+    public R<Void> updateBulkOrder(@Validated @RequestBody BulkOrderListBo bulkOrderListBo) {
+        return toAjax(bulkOrderListService.updateBulkOrder(bulkOrderListBo));
+    }
+
+    @SaIgnore
+    @DeleteMapping("/{bulkOrderListIds}")
+    public R<Void> deleteBulkOrderById(@PathVariable Long[] bulkOrderListIds) {
+        return toAjax(bulkOrderListService.deleteBulkOrderById(bulkOrderListIds));
+    }
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/GoodsController.java

@@ -0,0 +1,45 @@
+package org.dromara.bulk.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.bo.GoodsBo;
+import org.dromara.bulk.domain.vo.GoodsVo;
+import org.dromara.bulk.service.GoodsService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bulkOrder/goods")
+public class GoodsController extends BaseController {
+    private final GoodsService goodsService;
+
+    @SaIgnore
+    @GetMapping("/PageList")
+    public TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery) {
+        return goodsService.selectPageGoodsList(goodsBo, pageQuery);
+    }
+
+    @SaIgnore
+    @PostMapping()
+    public R<Void> insertGoods(@Validated @RequestBody GoodsBo goodsBo) {
+        return toAjax(goodsService.insertGoods(goodsBo));
+    }
+
+    @SaIgnore
+    @PutMapping()
+    public R<Void> updateGoods(@Validated @RequestBody GoodsBo goodsBo) {
+        return toAjax(goodsService.updateGoods(goodsBo));
+    }
+
+    @SaIgnore
+    @DeleteMapping("/{goodsIds}")
+    public R<Void> deleteGoodsById(@PathVariable Long[] goodsIds) {
+        return toAjax(goodsService.deleteGoodsById(goodsIds));
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/BulkOrderList.java

@@ -1,12 +1,13 @@
 package org.dromara.bulk.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
 
 /**
-* 计划详情
+* 大货订单列表基类
 */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -21,7 +22,6 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 系统单号
     */
-
     private String sysNo;
 
     /**
@@ -107,41 +107,49 @@ public class BulkOrderList extends TenantEntity {
     /**
     * 面料id
     */
+    @TableField("goods_type_extend_1_id")
     private String goodsTypeExtend1Id;
 
     /**
     * 面料的扩展信息
     */
+    @TableField("goods_type_extend_1_attr")
     private String goodsTypeExtend1Attr;
 
     /**
     * 物料id
     */
+    @TableField("goods_type_extend_2_id")
     private String goodsTypeExtend2Id;
 
     /**
     * 物料的扩展信息
     */
+    @TableField("goods_type_extend_2_attr")
     private String goodsTypeExtend2Attr;
 
     /**
     * 工艺类型id
     */
+    @TableField("goods_type_extend_3_id")
     private String goodsTypeExtend3Id;
 
     /**
     * 工艺类型的扩展信息
     */
+    @TableField("goods_type_extend_3_attr")
     private String goodsTypeExtend3Attr;
 
     /**
     * 花型号id
     */
+    @TableField("goods_type_extend_4_id")
     private String goodsTypeExtend4Id;
 
     /**
     * 花型号的扩展信息
     */
+    @TableField("goods_type_extend_4_attr")
     private String goodsTypeExtend4Attr;
 
     /**
@@ -252,4 +260,24 @@ public class BulkOrderList extends TenantEntity {
     */
     private int duizhangStatus;
 
+    /**
+     * 白布类型
+     */
+    private String baibuType;
+
+    /**
+     * 白布价格
+     */
+    private String baibuPrice;
+
+    /**
+     * 白布单位
+     */
+    private String baibuUnit;
+
+    /**
+     * 烧花打包数量
+     */
+    private String shaohuaDabaoCount;
+
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/Goods.java

@@ -11,17 +11,38 @@ import org.dromara.common.tenant.core.TenantEntity;
 @TableName("fa_kuyou_goods")
 public class Goods extends TenantEntity {
 
+    /**
+     * 商品id
+     */
     private Long id;
 
+    /**
+     * 商品编码
+     */
     @TableField("goods_code")
     private String code;
 
+    /**
+     * 商品名称
+     */
     @TableField("goods_name")
     private String name;
 
+    /**
+     * 商品规格id
+     */
     @TableField("goods_specification_id")
     private String specificationId;
 
+    /**
+     * 商品单位id
+     */
     @TableField("more_unit_id")
     private int unit_id;
+
+    /**
+     * 商品图片
+     */
+    @TableField("goods_image")
+    private String image;
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/BulkOrderListBo.java

@@ -75,11 +75,13 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 进价
     */
+    @NotBlank(message = "进价不能为空")
     private double purchase;
 
     /**
     * 数量
     */
+    @NotBlank(message = "数量不能为空")
     private double number;
 
     /**
@@ -241,6 +243,7 @@ public class BulkOrderListBo extends BaseEntity {
     /**
     * 下单码数类型
     */
+    @NotBlank(message = "下单码数类型不能为空")
     private String numberOrdersPlacedType;
     /**
     * 发货数量
@@ -255,4 +258,24 @@ public class BulkOrderListBo extends BaseEntity {
     */
     private int duizhangStatus;
 
+    /**
+     * 白布类型
+     */
+    private String baibuType;
+
+    /**
+     * 白布价格
+     */
+    private String baibuPrice;
+
+    /**
+     * 白布单位
+     */
+    private String baibuUnit;
+
+    /**
+     * 烧花打包数量
+     */
+    private String shaohuaDabaoCount;
+
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/BulkOrderListVo.java

@@ -253,4 +253,24 @@ public class BulkOrderListVo extends BaseEntity {
     */
     private int duizhangStatus;
 
+    /**
+     * 白布类型
+     */
+    private String baibuType;
+
+    /**
+     * 白布价格
+     */
+    private String baibuPrice;
+
+    /**
+     * 白布单位
+     */
+    private String baibuUnit;
+
+    /**
+     * 烧花打包数量
+     */
+    private String shaohuaDabaoCount;
+
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/GoodsVo.java

@@ -11,13 +11,33 @@ import org.dromara.common.mybatis.core.domain.BaseEntity;
 @AutoMapper(target = Goods.class)
 public class GoodsVo extends BaseEntity {
 
+    /**
+     * 商品id
+     */
     private Long id;
 
+    /**
+     * 商品编码
+     */
     private String code;
 
+    /**
+     * 商品名称
+     */
     private String name;
 
+    /**
+     * 规格id
+     */
     private String specificationId;
 
+    /**
+     * 单位id
+     */
     private int unit_id;
+
+    /**
+     * 图片
+     */
+    private String image;
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/BulkOrderListServiceImpl.java

@@ -8,10 +8,14 @@ import org.dromara.bulk.domain.bo.BulkOrderListBo;
 import org.dromara.bulk.domain.vo.BulkOrderListVo;
 import org.dromara.bulk.mapper.BulkOrderListMapper;
 import org.dromara.bulk.service.BulkOrderListService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+
 
 @Service
 @RequiredArgsConstructor
@@ -22,24 +26,27 @@ public class BulkOrderListServiceImpl implements BulkOrderListService {
     @Override
     public TableDataInfo<BulkOrderListVo> selectPageBulkOrderList(BulkOrderListBo bulkOrderListBo, PageQuery pageQuery) {
         QueryWrapper<BulkOrderList> qw = new QueryWrapper<>();
-        qw.eq(null != bulkOrderListBo.getId(), "id", bulkOrderListBo.getId());
+        qw.like(null != bulkOrderListBo.getId(), "id", bulkOrderListBo.getId());
         Page<BulkOrderListVo> page = bulkOrderListMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
 
     @Override
     public int insertBulkOrder(BulkOrderListBo bulkOrderListBo) {
-        return 0;
+        OrderNumberGenerator orderNumberGenerator = OrderNumberGenerator.getInstance();
+        bulkOrderListBo.setScNo(orderNumberGenerator.generateOrderNumber("SC"));
+        bulkOrderListBo.setSysNo(orderNumberGenerator.generateOrderNumber("SYS"));
+        return bulkOrderListMapper.insert(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
     }
 
     @Override
     public int updateBulkOrder(BulkOrderListBo bulkOrderListBo) {
-        return 0;
+        return bulkOrderListMapper.updateById(MapstructUtils.convert(bulkOrderListBo, BulkOrderList.class));
     }
 
     @Override
     public int deleteBulkOrderById(Long[] bulkOrderListIds) {
-        return 0;
+        return bulkOrderListMapper.deleteByIds(Arrays.asList(bulkOrderListIds));
     }
 }
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/GoodsServiceImpl.java

@@ -1,6 +1,9 @@
 package org.dromara.bulk.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.Goods;
 import org.dromara.bulk.domain.bo.GoodsBo;
 import org.dromara.bulk.domain.vo.GoodsVo;
 import org.dromara.bulk.mapper.GoodsMapper;
@@ -18,7 +21,9 @@ public class GoodsServiceImpl implements GoodsService {
     private final GoodsMapper goodsMapper;
     @Override
     public TableDataInfo<GoodsVo> selectPageGoodsList(GoodsBo goodsBo, PageQuery pageQuery) {
-        return null;
+        QueryWrapper<Goods> qw = new QueryWrapper<>();
+        Page<GoodsVo> page = goodsMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
     }
 
     @Override