From b3494db4eca536682bfc1dd3909da644433bc3a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=95=AC=E7=A7=91?= <1810539219@qq.com> Date: Sat, 18 Jul 2026 12:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9F=E5=93=81=E9=87=87=E8=B4=AD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/merchant/RepoRecordController.java | 30 ++++++++- .../web/merchant/RepositoryController.java | 12 ++-- .../web/school/SchoolOrderController.java | 4 +- .../web/supplier/FoodProductController.java | 9 ++- .../controller/system/SysDeptController.java | 7 ++ .../controller/system/SysUserController.java | 14 ++++ .../foodpurchase/common/utils/DateUtils.java | 10 +++ .../common/utils/StringUtils.java | 8 +++ .../fdsafe/entity/FoodProduct.java | 4 ++ .../fdsafe/entity/RepoRecord.java | 4 +- .../fdsafe/entity/Repository.java | 1 - .../foodpurchase/fdsafe/entity/XhCreate.java | 14 ++++ .../fdsafe/mapper/FoodProductMapper.java | 2 +- .../fdsafe/mapper/RepoRecordMapper.java | 4 +- .../fdsafe/mapper/RepositoryMapper.java | 3 +- .../foodpurchase/fdsafe/mapper/XhMapper.java | 26 +++++++ .../fdsafe/service/IFoodProductService.java | 2 + .../fdsafe/service/IRepoRecordService.java | 2 + .../fdsafe/service/IRepositoryService.java | 3 +- .../fdsafe/service/ISchoolOrderService.java | 2 +- .../service/impl/FoodProductServiceImpl.java | 19 ++++-- .../service/impl/RepoRecordServiceImpl.java | 16 +++-- .../service/impl/RepositoryServiceImpl.java | 52 +++++++++++++- .../impl/SchoolCartItemServiceImpl.java | 14 ++-- .../service/impl/SchoolOrderServiceImpl.java | 62 ++++++++++++++--- .../fdsafe/vo/FoodProductCKVO.java | 2 +- .../foodpurchase/fdsafe/vo/FoodProductVO.java | 13 +++- .../foodpurchase/fdsafe/vo/RepoRecordVO.java | 12 ++++ .../foodpurchase/fdsafe/vo/RepositoryVO.java | 67 +++++++++++++++++++ .../fdsafe/vo/SchoolOrderItemVO.java | 4 ++ .../zf/foodpurchase/fdsafe/vo/XhCreateVO.java | 14 ++++ .../system/mapper/SysUserMapper.java | 2 + .../system/service/ISysDeptService.java | 2 + .../system/service/ISysUserService.java | 2 + .../service/impl/SysDeptServiceImpl.java | 7 ++ .../service/impl/SysUserServiceImpl.java | 5 ++ .../resources/mapper/FoodProductMapper.xml | 27 +++++--- .../resources/mapper/RepoRecordMapper.xml | 42 +++++++++--- .../resources/mapper/RepositoryMapper.xml | 9 ++- .../resources/mapper/SchoolCartItemMapper.xml | 14 ++-- .../mapper/SchoolOrderItemMapper.xml | 10 +-- .../src/main/resources/mapper/XhMapper.xml | 29 ++++++++ .../resources/mapper/system/SysUserMapper.xml | 31 +++++++++ 43 files changed, 530 insertions(+), 86 deletions(-) create mode 100644 fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/XhCreate.java create mode 100644 fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/XhMapper.java create mode 100644 fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepositoryVO.java create mode 100644 fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/XhCreateVO.java create mode 100644 fp-system/src/main/resources/mapper/XhMapper.xml diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepoRecordController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepoRecordController.java index 4706338..41b8b13 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepoRecordController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepoRecordController.java @@ -51,6 +51,27 @@ public class RepoRecordController extends BaseController { }); return getDataTable(list); } + + @GetMapping("/listByProductId") + public AjaxResult listByProductId(Long productId) + { + List list = repoRecordService.selectRepoRecordListByProductId(productId); + list.forEach(f -> { + if(f.getStatus() != null){ + if(ObjectUtil.equal(f.getStatus(),1)){ + f.setStatusName("入库"); + } else{ + f.setStatusName("出库"); + } + } + if(f.getProductId() != null){ + FoodProduct products = foodProductsService.getById(f.getProductId()); + f.setFoodProducts(Arrays.asList(products)); + } + }); + return AjaxResult.success(list); + } + @GetMapping(value = "/{repoRecordId}") public AjaxResult getInfo(@PathVariable("repoRecordId") Long repoRecordId) { @@ -64,9 +85,14 @@ public class RepoRecordController extends BaseController { } if(repoRecordVO.getProductId() != null){ FoodProduct products = foodProductsService.getById(repoRecordVO.getProductId()); - repoRecordVO.setFoodProducts(Arrays.asList(products)); + if(ObjectUtil.isNotNull( products)){ + repoRecordVO.setFoodProductNum(products.getNum()); + repoRecordVO.setFoodProductName(products.getName()); + repoRecordVO.setUnitName(products.getUnitLabel()); + repoRecordVO.setPrice(products.getPrice()); + } } - return success(repoRecordService.selectRepoRecordByRepoRecordId(repoRecordId)); + return success(repoRecordVO); } /** diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepositoryController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepositoryController.java index 29d8d94..6144a1a 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepositoryController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/merchant/RepositoryController.java @@ -11,6 +11,7 @@ import com.zf.foodpurchase.common.core.page.TableDataInfo; import com.zf.foodpurchase.common.utils.DateUtils; import com.zf.foodpurchase.fdsafe.entity.Repository; import com.zf.foodpurchase.fdsafe.service.IRepositoryService; +import com.zf.foodpurchase.fdsafe.vo.RepositoryVO; import com.zf.foodpurchase.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -51,7 +52,7 @@ public class RepositoryController extends BaseController { repository.setMerchantId(null); } } - List list = repositoryService.queryRepoList(repository); + List list = repositoryService.queryRepoList(repository); return AjaxResult.success("查询成功", list); } @@ -70,16 +71,17 @@ public class RepositoryController extends BaseController { repository.setMerchantId(null); } } - List list = repositoryService.queryRepoList(repository); + List list = repositoryService.queryRepoList(repository); return getDataTable(list); } @PostMapping("/addRepo") public AjaxResult addRepo(@Validated @RequestBody Repository repository) { SysUser sysUser = userService.getUser(); - if (sysUser.isAdmin()) { - if(repository.getMerchantId() == null){ - return error("必须指定要添加的仓库所属商户"); + if(ObjectUtil.isNotNull(sysUser)){ + if(!sysUser.isAdmin()){ + Long deptId = sysUser.getDeptId(); + repository.setMerchantId(deptId); } } repository.setCreateTime(DateUtils.getNowDate()); diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java index f038e69..71f9f37 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/school/SchoolOrderController.java @@ -153,7 +153,7 @@ public class SchoolOrderController extends BaseController { * 供货商接单 */ @GetMapping("/supplierAcceptOrder") - public AjaxResult supplierAcceptOrder(@Validated SupplierAcceptOrderVO supplierAcceptOrderVO) { + public AjaxResult supplierAcceptOrder(String orderNo) { // 填充学校id,教育局id等数据 SysUser user = userService.getUser(); if(!user.isAdmin()){ @@ -162,7 +162,7 @@ public class SchoolOrderController extends BaseController { return error("非供货商账号无法接单"); } } - return schoolOrderService.supplierAcceptOrder(supplierAcceptOrderVO); + return schoolOrderService.supplierAcceptOrder(orderNo); } /** diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java index 1e23d53..1e6b894 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/fdsafe/web/supplier/FoodProductController.java @@ -42,10 +42,10 @@ public class FoodProductController extends BaseController { @GetMapping("/pageList") public TableDataInfo pageList(FoodProductVO foodProductVO) { - startPage(); SysUser user = userService.getUser(); + startPage(); if(!user.isAdmin()){ - foodProductVO.setSchoolId(user.getSchoolId()); + foodProductVO.setDeptIds(user.getDeptIdList()); } foodProductVO.setDelFlag(0); List list = foodProductService.queryFoodProductVO(foodProductVO); @@ -68,6 +68,11 @@ public class FoodProductController extends BaseController { return foodProductService.supplierUpdate(foodProductVO); } + @PostMapping("/deleteLogic") + public AjaxResult deleteLogic(Long foodProductId) { + return foodProductService.supplierDelete(foodProductId); + } + /** * 教育局审核商品 */ diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysDeptController.java b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysDeptController.java index fb27ac5..4081f48 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysDeptController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysDeptController.java @@ -39,6 +39,13 @@ public class SysDeptController extends BaseController return success(depts); } + @GetMapping("/listSuppliers") + public AjaxResult listSuppliers() + { + List depts = deptService.selectSuppliers(); + return success(depts); + } + /** * 查询部门列表（排除节点） */ diff --git a/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysUserController.java b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysUserController.java index e8ddd5f..aaa4948 100644 --- a/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysUserController.java +++ b/fp-admin/src/main/java/com/zf/foodpurchase/web/controller/system/SysUserController.java @@ -63,6 +63,20 @@ public class SysUserController extends BaseController return getDataTable(list); } + @ApiOperation("查询仓库管理员列表") + @GetMapping("/listRepoUsers") + public AjaxResult listRepoUsers() + { + SysUser sysUser = userService.getUser(); + SysUser user = new SysUser(); + if(!sysUser.isAdmin()){ + List deptIds = sysUser.getDeptIdList(); + user.setDeptIdList(deptIds); + } + List list = userService.listRepoUsers(user); + return AjaxResult.success(list); + } + @Log(title = "用户管理", businessType = BusinessType.EXPORT) @PreAuthorize("@ss.hasPermi('system:user:export')") @PostMapping("/export") diff --git a/fp-common/src/main/java/com/zf/foodpurchase/common/utils/DateUtils.java b/fp-common/src/main/java/com/zf/foodpurchase/common/utils/DateUtils.java index 47004e2..145b957 100644 --- a/fp-common/src/main/java/com/zf/foodpurchase/common/utils/DateUtils.java +++ b/fp-common/src/main/java/com/zf/foodpurchase/common/utils/DateUtils.java @@ -271,4 +271,14 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils System.out.println(getStartOfDay(now).getTime()); } + public static String getShortYearMonth(Date date) { + String dateTime = DateFormatUtils.format(date, "yyMM"); + return dateTime; + } + + public static String getShortYearMonthDay(Date date) { + String dateTime = DateFormatUtils.format(date, "yyMMdd"); + return dateTime; + } + } diff --git a/fp-common/src/main/java/com/zf/foodpurchase/common/utils/StringUtils.java b/fp-common/src/main/java/com/zf/foodpurchase/common/utils/StringUtils.java index a382539..9534bb4 100644 --- a/fp-common/src/main/java/com/zf/foodpurchase/common/utils/StringUtils.java +++ b/fp-common/src/main/java/com/zf/foodpurchase/common/utils/StringUtils.java @@ -694,4 +694,12 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils .collect(Collectors.toList()); // 收集为List } + public static String formatNumTwo(int num) { + return String.format("%02d", num); + } + + public static String formatNumThree(int num) { + return String.format("%03d", num); + } + } \ No newline at end of file diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/FoodProduct.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/FoodProduct.java index 0dc8c6e..37d1832 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/FoodProduct.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/FoodProduct.java @@ -111,4 +111,8 @@ public class FoodProduct implements Serializable { * 有效标志 */ private Integer delFlag; + + private Long deptId; + + private String imageUrl; } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/RepoRecord.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/RepoRecord.java index f567779..4f72d81 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/RepoRecord.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/RepoRecord.java @@ -68,7 +68,9 @@ public class RepoRecord extends BaseEntity { private String orderNo; - private Long schoolId; + private Long deptId; private List deptIds; + + private Long operId; } \ No newline at end of file diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/Repository.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/Repository.java index 63d3866..05472e4 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/Repository.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/Repository.java @@ -90,7 +90,6 @@ public class Repository implements Serializable { private Long manager; @TableField - @NotNull(message = "仓库编号不能为空") private String repoNum; @TableField diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/XhCreate.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/XhCreate.java new file mode 100644 index 0000000..aa9fc27 --- /dev/null +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/entity/XhCreate.java @@ -0,0 +1,14 @@ +package com.zf.foodpurchase.fdsafe.entity; + + +import lombok.Data; + +@Data +public class XhCreate { + + private Integer id; + private Integer deptNum; + private Long deptId; + private String timeStr; + private Integer xh; +} diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/FoodProductMapper.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/FoodProductMapper.java index caad40d..045e720 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/FoodProductMapper.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/FoodProductMapper.java @@ -19,5 +19,5 @@ public interface FoodProductMapper extends BaseMapper { List queryFoodProductVO(FoodProductVO foodProductVO); List pageCKList(Integer repoId); - + void updateDelFlag(Long foodProductId); } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepoRecordMapper.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepoRecordMapper.java index f69401c..86fd28e 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepoRecordMapper.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepoRecordMapper.java @@ -14,5 +14,7 @@ public interface RepoRecordMapper extends BaseMapper { public RepoRecordVO selectRepoRecordByRepoRecordId(@Param("repoRecordId") Long repoRecordId); - public List selectRepoRecordList(@Param("productName") String productName, @Param("categoryId") Integer categoryId, @Param("repoId") Integer repoId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); + public List selectRepoRecordList(@Param("productName") String productName, @Param("status") Integer status, @Param("repoId") Integer repoId, @Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("deptIds") List deptIds); + + public List selectRepoRecordListByProductId(Long productId); } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepositoryMapper.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepositoryMapper.java index f140b2d..f2705d3 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepositoryMapper.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/RepositoryMapper.java @@ -2,6 +2,7 @@ package com.zf.foodpurchase.fdsafe.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zf.foodpurchase.fdsafe.entity.Repository; +import com.zf.foodpurchase.fdsafe.vo.RepositoryVO; import java.util.List; @@ -15,5 +16,5 @@ import java.util.List; */ public interface RepositoryMapper extends BaseMapper { - List queryRepoList(Repository queryRepository); + List queryRepoList(Repository queryRepository); } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/XhMapper.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/XhMapper.java new file mode 100644 index 0000000..719fc04 --- /dev/null +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/mapper/XhMapper.java @@ -0,0 +1,26 @@ +package com.zf.foodpurchase.fdsafe.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zf.foodpurchase.fdsafe.entity.XhCreate; +import com.zf.foodpurchase.fdsafe.vo.XhCreateVO; + +import java.util.List; + +/** + *

+ * 食材表 Mapper 接口 + *

+ * + * @author lilj + * @since 2025-04-17 + */ +public interface XhMapper { + + XhCreate queryXhCreate(XhCreateVO xhCreateVO); + + int insertXhCreate(XhCreate xhCreate); + + int updateXhCreate(XhCreate xhCreate); + + int selectMaxDeptNum(); +} diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IFoodProductService.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IFoodProductService.java index d64c41c..1c8407c 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IFoodProductService.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IFoodProductService.java @@ -24,6 +24,8 @@ public interface IFoodProductService extends IService { AjaxResult supplierUpdate(FoodProductVO foodProductVO); + AjaxResult supplierDelete(Long foodProductId); + AjaxResult eduCheck(FoodProductVO foodProductVO); List pageCKList(Integer repoId); diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepoRecordService.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepoRecordService.java index 2aad0dc..b77bdeb 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepoRecordService.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepoRecordService.java @@ -19,4 +19,6 @@ public interface IRepoRecordService extends IService { RepoRecordVO selectRepoRecordByRepoRecordId(Long repoRecordId); List selectRepoRecordList(RepoRecord repoRecord); + + List selectRepoRecordListByProductId(Long productId); } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepositoryService.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepositoryService.java index 3e6938b..c61553b 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepositoryService.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/IRepositoryService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zf.foodpurchase.common.core.domain.AjaxResult; import com.zf.foodpurchase.fdsafe.entity.Repository; import com.zf.foodpurchase.fdsafe.vo.ProductCountVO; +import com.zf.foodpurchase.fdsafe.vo.RepositoryVO; import java.util.List; @@ -17,7 +18,7 @@ import java.util.List; */ public interface IRepositoryService extends IService { - List queryRepoList(Repository quryRepository); + List queryRepoList(Repository quryRepository); AjaxResult saveRepo(Repository repository); diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/ISchoolOrderService.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/ISchoolOrderService.java index 5f04e5d..8d5ff07 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/ISchoolOrderService.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/ISchoolOrderService.java @@ -28,7 +28,7 @@ public interface ISchoolOrderService extends IService { AjaxResult updateOrderRemark(@Valid SchoolModifyOrderRemarkVO remarkVO); - AjaxResult supplierAcceptOrder(SupplierAcceptOrderVO supplierAcceptOrderVO); + AjaxResult supplierAcceptOrder(String orderNo); boolean updateOrderStatus(SchoolOrder schoolOrder); diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodProductServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodProductServiceImpl.java index a762069..a5a694c 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodProductServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/FoodProductServiceImpl.java @@ -32,11 +32,10 @@ import java.util.List; */ @Service public class FoodProductServiceImpl extends ServiceImpl implements IFoodProductService { - @Autowired - private FoodMapper foodMapper; @Autowired private ISysUserService sysUserService; - + @Autowired + private FoodProductMapper foodProductMapper; @Override public List queryFoodProductVO(FoodProductVO foodProductVO) { @@ -90,6 +89,12 @@ public class FoodProductServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + /*LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Food::getFoodId, foodProductVO.getFoodId()); Food food = foodMapper.selectOne(queryWrapper); if(food == null){ throw new RuntimeException("商品关联食材不存在,无法添加"); - } + }*/ SysUser user = sysUserService.getUser(); FoodProduct foodProduct = new FoodProduct(); BeanUtils.copyProperties(foodProductVO, foodProduct); if(!user.isAdmin()){ - foodProduct.setSupplierId(user.getSchoolId()); + foodProduct.setDeptId(user.getDeptId()); } - foodProduct.setEduId(food.getEduId()); + //foodProduct.setEduId(food.getEduId()); // 审核项置空. foodProduct.setCheckStatus(FoodStatusConstants.PRODUCT_WAIT_CHECK); foodProduct.setCheckRemark(null); diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepoRecordServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepoRecordServiceImpl.java index 67f71d3..22976c8 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepoRecordServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepoRecordServiceImpl.java @@ -63,11 +63,12 @@ public class RepoRecordServiceImpl extends ServiceImpl selectRepoRecordList(RepoRecord repoRecord) { String productName = repoRecord.getProductName(); - Integer categoryId = repoRecord.getCategoryId(); + Integer status = repoRecord.getStatus(); Integer repoId = repoRecord.getRepoId(); Date startTime = repoRecord.getStartTime(); Date endTime = repoRecord.getEndTime(); - return repoRecordMapper.selectRepoRecordList(productName, categoryId, repoId, startTime, endTime); + List deptIds = repoRecord.getDeptIds(); + return repoRecordMapper.selectRepoRecordList(productName, status, repoId, startTime, endTime,deptIds); + } + + @Override + public List selectRepoRecordListByProductId(Long productId) { + return repoRecordMapper.selectRepoRecordListByProductId(productId); } } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepositoryServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepositoryServiceImpl.java index 59110bc..a76f95d 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepositoryServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/RepositoryServiceImpl.java @@ -1,17 +1,26 @@ package com.zf.foodpurchase.fdsafe.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zf.foodpurchase.common.constant.Constants; import com.zf.foodpurchase.common.core.domain.AjaxResult; +import com.zf.foodpurchase.common.core.domain.entity.SysUser; +import com.zf.foodpurchase.common.utils.DateUtils; +import com.zf.foodpurchase.common.utils.StringUtils; import com.zf.foodpurchase.fdsafe.entity.Repository; +import com.zf.foodpurchase.fdsafe.entity.XhCreate; import com.zf.foodpurchase.fdsafe.mapper.RepositoryMapper; +import com.zf.foodpurchase.fdsafe.mapper.XhMapper; import com.zf.foodpurchase.fdsafe.service.IRepositoryService; +import com.zf.foodpurchase.fdsafe.vo.RepositoryVO; +import com.zf.foodpurchase.fdsafe.vo.XhCreateVO; +import com.zf.foodpurchase.system.service.ISysUserService; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; /** @@ -27,14 +36,51 @@ import java.util.List; public class RepositoryServiceImpl extends ServiceImpl implements IRepositoryService { @Autowired private RepositoryMapper repositoryMapper; + @Autowired + private XhMapper xhMapper; + @Autowired + private ISysUserService userService; @Override - public List queryRepoList(Repository quryRepository) { + public List queryRepoList(Repository quryRepository) { return repositoryMapper.queryRepoList(quryRepository); } @Override public AjaxResult saveRepo(Repository repository) { + SysUser user = userService.getUser(); + if(ObjectUtil.isNull(user.getDeptId())){ + throw new RuntimeException("登录人员部门为空，不能生成订单编号"); + } + Date date = DateUtils.getNowDate(); + String repoNo = ""; + String dateStr = DateUtils.getShortYearMonthDay( date); + Long deptId = user.getDeptId(); + XhCreate xhCreate = new XhCreate(); + xhCreate.setDeptId(deptId); + xhCreate.setTimeStr(dateStr); + XhCreateVO xhCreateVO = new XhCreateVO(); + BeanUtils.copyProperties(xhCreate,xhCreateVO); + XhCreate xhCreateNew = xhMapper.queryXhCreate(xhCreateVO); + if(ObjectUtil.isNull(xhCreateNew)){ + Integer deptNum = xhMapper.selectMaxDeptNum(); + Integer num = 1; + if(ObjectUtil.isNotNull(deptNum)){ + num = deptNum+1; + } + xhCreate.setDeptNum(num); + xhCreate.setXh(1); + xhMapper.insertXhCreate(xhCreate); + repoNo = StringUtils.formatNumThree(deptNum)+dateStr+"001"; + }else{ + Integer deptNum = xhCreateNew.getDeptNum(); + Integer xhNum = xhCreateNew.getXh()+1; + String xhNumStr = StringUtils.formatNumThree(xhNum); + repoNo = StringUtils.formatNumThree(deptNum)+dateStr+xhNumStr; + xhCreateNew.setXh(xhNum); + xhMapper.updateXhCreate(xhCreateNew); + } + repository.setRepoNum(repoNo); if (checkRepoNameUnique(repository)) { return AjaxResult.error("仓库名称已存在请更换仓库名称"); } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SchoolCartItemServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SchoolCartItemServiceImpl.java index 5a3fdda..635a075 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SchoolCartItemServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/service/impl/SchoolCartItemServiceImpl.java @@ -43,20 +43,20 @@ public class SchoolCartItemServiceImpl extends ServiceImpl querySupplierOrderVO(SchoolOrderVO schoolOrderVO) { @@ -82,6 +93,10 @@ public class SchoolOrderServiceImpl extends ServiceImpl schoolCartItemIds = submitOrderVO.getSchoolCartItemIds(); if (CollectionUtils.isEmpty(schoolCartItemIds)) { throw new RuntimeException("购物车项不能为空"); @@ -107,14 +122,14 @@ public class SchoolOrderServiceImpl extends ServiceImpl schoolOrders = new ArrayList<>(); + Date date = new Date(); // 根据供货商id合并订单项: for (Map.Entry> entry : schoolOrderItemMap.entrySet()) { List schoolOrderItemList = entry.getValue(); SchoolOrder schoolOrder = new SchoolOrder(); BeanUtils.copyProperties(submitOrderVO, schoolOrder); schoolOrder.setOrderStatus(OrderStatusConstants.WAIT_ACCEPT); - String orderNo = NoUtils.generateNo(); + //String orderNo = NoUtils.generateNo(); + String orderNo = ""; + String dateStr = DateUtils.getShortYearMonth( date); + Long deptId = user.getDeptId(); + XhCreate xhCreate = new XhCreate(); + xhCreate.setDeptId(deptId); + xhCreate.setTimeStr(dateStr); + XhCreateVO xhCreateVO = new XhCreateVO(); + BeanUtils.copyProperties(xhCreate,xhCreateVO); + XhCreate xhCreateNew = xhMapper.queryXhCreate(xhCreateVO); + if(ObjectUtil.isNull(xhCreateNew)){ + Integer deptNum = xhMapper.selectMaxDeptNum(); + Integer num = 1; + if(ObjectUtil.isNotNull(deptNum)){ + num = deptNum+1; + } + xhCreate.setDeptNum(num); + xhCreate.setXh(1); + xhMapper.insertXhCreate(xhCreate); + orderNo = StringUtils.formatNumThree(num)+dateStr+"001"; + }else{ + Integer deptNum = xhCreateNew.getDeptNum(); + Integer xhNum = xhCreateNew.getXh()+1; + String xhNumStr = StringUtils.formatNumThree(xhNum); + orderNo = StringUtils.formatNumThree(deptNum)+dateStr+xhNumStr; + xhCreateNew.setXh(xhNum); + xhMapper.updateXhCreate(xhCreateNew); + } + schoolOrder.setOrderNo(orderNo); // 计算订单总金额 BigDecimal orderTotalMoney = new BigDecimal(0); @@ -239,22 +283,20 @@ public class SchoolOrderServiceImpl extends ServiceImpl deptIds; + + private String imageUrl; } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepoRecordVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepoRecordVO.java index bb7d60f..4ce0a43 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepoRecordVO.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepoRecordVO.java @@ -69,4 +69,16 @@ public class RepoRecordVO { * 说明 */ private String msg; + + private Long operId; + + private String operName; + + private String foodProductNum; + + private String foodProductName; + + private String unitName; + + private BigDecimal price; } \ No newline at end of file diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepositoryVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepositoryVO.java new file mode 100644 index 0000000..0501b56 --- /dev/null +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/RepositoryVO.java @@ -0,0 +1,67 @@ +package com.zf.foodpurchase.fdsafe.vo; + +import lombok.Data; +import java.util.Date; +import java.util.List; + + +@Data +public class RepositoryVO { + + private Integer id; + + private String repoName; + /** + * 所属商户id + */ + private Long merchantId; + + + /** + * 所属商户名称 + */ + private String merchantName; + + /** + * 区划编码 + */ + private String areaCode; + + /** + * 详细地址 + */ + private String detailAddress; + + /** + * 是否是默认仓库:0 否 1 是 + */ + private String defaultRepo; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 操作人 + */ + private Long operId; + + private Long manager; + + private String repoNum; + + private Integer orderNum; + private List deptIds; + + private Integer wpCount; + + private Integer spCount; + + private String managerName; +} diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolOrderItemVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolOrderItemVO.java index aa30d64..afeddfe 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolOrderItemVO.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/SchoolOrderItemVO.java @@ -109,4 +109,8 @@ public class SchoolOrderItemVO extends CommonVO implements Serializable { */ private String foodProductRemark; + private String supplierName; + + private String modelName; + } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/XhCreateVO.java b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/XhCreateVO.java new file mode 100644 index 0000000..490f948 --- /dev/null +++ b/fp-system/src/main/java/com/zf/foodpurchase/fdsafe/vo/XhCreateVO.java @@ -0,0 +1,14 @@ +package com.zf.foodpurchase.fdsafe.vo; + + +import lombok.Data; + +@Data +public class XhCreateVO { + + private Integer id; + private Integer deptNum; + private Long deptId; + private String timeStr; + private Integer xh; +} diff --git a/fp-system/src/main/java/com/zf/foodpurchase/system/mapper/SysUserMapper.java b/fp-system/src/main/java/com/zf/foodpurchase/system/mapper/SysUserMapper.java index 923bed2..ca983e2 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/system/mapper/SysUserMapper.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/system/mapper/SysUserMapper.java @@ -19,6 +19,8 @@ public interface SysUserMapper */ public List selectUserList(SysUser sysUser); + public List selectRepoUsers(SysUser sysUser); + /** * 根据条件分页查询已配用户角色列表 * diff --git a/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysDeptService.java b/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysDeptService.java index d7ce96e..f83c361 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysDeptService.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysDeptService.java @@ -121,4 +121,6 @@ public interface ISysDeptService * @return 结果 */ public int deleteDeptById(Long deptId); + + public List selectSuppliers(); } diff --git a/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysUserService.java b/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysUserService.java index a053a2a..0eb7335 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysUserService.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/system/service/ISysUserService.java @@ -18,6 +18,8 @@ public interface ISysUserService */ public List selectUserList(SysUser user); + public List listRepoUsers(SysUser user); + /** * 根据条件分页查询已分配用户角色列表 * diff --git a/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysDeptServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysDeptServiceImpl.java index 2a68f0f..fbfefd1 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysDeptServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysDeptServiceImpl.java @@ -293,6 +293,13 @@ public class SysDeptServiceImpl implements ISysDeptService return deptMapper.deleteDeptById(deptId); } + @Override + public List selectSuppliers() { + SysDept t = new SysDept(); + t.setMerchantFlag("1"); + return deptMapper.selectDeptList(t); + } + /** * 递归列表 */ diff --git a/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysUserServiceImpl.java b/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysUserServiceImpl.java index 19dca9a..408335d 100644 --- a/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysUserServiceImpl.java +++ b/fp-system/src/main/java/com/zf/foodpurchase/system/service/impl/SysUserServiceImpl.java @@ -90,6 +90,11 @@ public class SysUserServiceImpl implements ISysUserService return userMapper.selectUserList(user); } + @Override + public List listRepoUsers(SysUser user) { + return userMapper.selectRepoUsers(user); + } + /** * 根据条件分页查询已分配用户角色列表 * diff --git a/fp-system/src/main/resources/mapper/FoodProductMapper.xml b/fp-system/src/main/resources/mapper/FoodProductMapper.xml index 6430acd..1cdddf0 100644 --- a/fp-system/src/main/resources/mapper/FoodProductMapper.xml +++ b/fp-system/src/main/resources/mapper/FoodProductMapper.xml @@ -5,7 +5,7 @@ fp.food_product_id, fp.food_id, fp.price, fp.supplier_id, fp.edu_id, fp.remark, fp.check_remark, fp.check_status, fp.create_time, fp.update_time, fp.check_time, - fp.num, fp.name, fp.type_id,fp.unit_id,fp.spec_id + fp.num, fp.name, fp.type_id,fp.unit_id,fp.spec_id,fp.image_url + + update food_product set del_flag = 1 where food_product_id = #{foodProductId} + + diff --git a/fp-system/src/main/resources/mapper/RepoRecordMapper.xml b/fp-system/src/main/resources/mapper/RepoRecordMapper.xml index ffdb6dc..79601f6 100644 --- a/fp-system/src/main/resources/mapper/RepoRecordMapper.xml +++ b/fp-system/src/main/resources/mapper/RepoRecordMapper.xml @@ -15,17 +15,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + @@ -41,7 +43,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" total_cost, status, msg, - school_id, + dept_id, + oper_id, #{applyDate}, @@ -53,18 +56,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{totalCost}, #{status,jdbcType=INTEGER}, #{msg,jdbcType=VARCHAR}, - #{schoolId,jdbcType=BIGINT}, + #{deptId,jdbcType=BIGINT}, + #{operId,jdbcType=BIGINT}, + + + diff --git a/fp-system/src/main/resources/mapper/RepositoryMapper.xml b/fp-system/src/main/resources/mapper/RepositoryMapper.xml index e621c21..329dbd3 100644 --- a/fp-system/src/main/resources/mapper/RepositoryMapper.xml +++ b/fp-system/src/main/resources/mapper/RepositoryMapper.xml @@ -23,9 +23,13 @@ r.manager, r.order_num, d.dept_name as merchant_name from repository r left join sys_dept d on r.merchant_id = d.dept_id - diff --git a/fp-system/src/main/resources/mapper/SchoolCartItemMapper.xml b/fp-system/src/main/resources/mapper/SchoolCartItemMapper.xml index 66ee2f5..3b45e07 100644 --- a/fp-system/src/main/resources/mapper/SchoolCartItemMapper.xml +++ b/fp-system/src/main/resources/mapper/SchoolCartItemMapper.xml @@ -8,15 +8,13 @@ - select, - ft.type_label,fu.unit_label,fp.remark as food_product_remark + select soi.order_item_no, soi.order_no,soi.food_id, soi.school_id, soi.edu_id, soi.supplier_id, soi.food_product_id, soi.food_name, soi.price, soi.product_num, soi.type_id, soi.unit_id, soi.order_item_status, soi.create_time, soi.update_time, soi.order_item_remark,soi.refund_num, + ft.type_label,fu.unit_label,fp.remark as food_product_remark,sup.supplier_name supplierName,fu.unit_label modelName from school_order_item soi + left join supplier sup on soi.supplier_id=sup.supplier_id left join school_order so on soi.order_no = so.order_no left join food_product fp on soi.food_product_id = fp.food_product_id - left join food f on f.food_id = fp.food_id - left join food_type ft on ft.type_id = f.type_id - left join food_unit fu on fu.unit_id = f.unit_id + left join food_type ft on ft.type_id = fp.type_id + left join food_unit fu on fu.unit_id = fp.unit_id and soi.order_item_no = #{orderItemNo} diff --git a/fp-system/src/main/resources/mapper/XhMapper.xml b/fp-system/src/main/resources/mapper/XhMapper.xml new file mode 100644 index 0000000..8d1a5da --- /dev/null +++ b/fp-system/src/main/resources/mapper/XhMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + insert into xh_create(dept_num, dept_id, time_str, xh) + values(#{deptNum}, #{deptId}, #{timeStr}, #{xh}) + + + + update xh_create + set xh=#{xh} + where dept_id=#{deptId} and time_str=#{timeStr} + + + diff --git a/fp-system/src/main/resources/mapper/system/SysUserMapper.xml b/fp-system/src/main/resources/mapper/system/SysUserMapper.xml index c459ed6..09b84c4 100644 --- a/fp-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/fp-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -94,6 +94,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} + + +