From ec75df799bd314ded2c53d15e8aa937bdb1c0a30 Mon Sep 17 00:00:00 2001 From: skjia <106962133@qq.com> Date: Wed, 23 Apr 2025 22:37:03 +0800 Subject: [PATCH] =?UTF-8?q?jsk=20=20=E5=95=86=E8=B6=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceServiceImpl.java | 40 ++--- .../controller/SupermarketInfoController.java | 6 +- .../SupermarketProductController.java | 41 ++++- .../controller/SupermarketUnitController.java | 6 +- .../mapper/SupermarketProductMapper.java | 1 + .../service/SupermarketProductService.java | 4 + .../impl/SupermarketProductServiceImpl.java | 20 +++ .../WareHouseCategoryController.java | 85 +++++++++++ .../controller/WareHouseInfoController.java | 20 +-- .../warehouse/domain/WareHouseCategory.java | 28 ++++ .../core/warehouse/domain/WareHouseInfo.java | 4 +- .../mapper/WareHouseCategoryMapper.java | 55 +++++++ .../warehouse/mapper/WareHouseInfoMapper.java | 4 +- .../service/WareHouseCategoryService.java | 54 +++++++ .../service/WareHouseInfoService.java | 2 +- .../impl/WareHouseCategoryServiceImpl.java | 88 +++++++++++ .../impl/WareHouseInfoServiceImpl.java | 4 +- .../supermarket/SupermarketProductMapper.xml | 25 ++- .../warehouse/WareHouseCategoryMapper.xml | 59 ++++++++ .../mapper/warehouse/WareHouseInfoMapper.xml | 142 +++++++++--------- 20 files changed, 577 insertions(+), 111 deletions(-) create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/controller/WareHouseCategoryController.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseCategory.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseCategoryMapper.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseCategoryService.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseCategoryServiceImpl.java create mode 100644 bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseCategoryMapper.xml diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java index baffd49..3050cd3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/android/service/impl/DeviceServiceImpl.java @@ -12,25 +12,29 @@ import org.springframework.stereotype.Service; @Service public class DeviceServiceImpl implements DeviceService { - @Autowired - private DeviceMapper mapper; - - - @Value("${face.android.appId}") - private String appId; - @Value("${face.android.sdkKey}") - private String appKey; - @Override public AjaxResult getDeviceInfo(AppDTO dto) { - //判断设备是否存在 - DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto); - if (deviceInfoVo == null){ - return AjaxResult.error("设备不存在"); - } - deviceInfoVo.setAppId(appId); - deviceInfoVo.setAppKey(appKey); - deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID)); - return AjaxResult.success(deviceInfoVo); + return null; } +// @Autowired +// private DeviceMapper mapper; +// +// +// @Value("${face.android.appId}") +// private String appId; +// @Value("${face.android.sdkKey}") +// private String appKey; +// +// @Override +// public AjaxResult getDeviceInfo(AppDTO dto) { +// //判断设备是否存在 +// DeviceInfoVo deviceInfoVo = mapper.getDeviceInfo(dto); +// if (deviceInfoVo == null){ +// return AjaxResult.error("设备不存在"); +// } +// deviceInfoVo.setAppId(appId); +// deviceInfoVo.setAppKey(appKey); +// deviceInfoVo.setTenantId(String.valueOf(GlobalConstants.TENANT_ID)); +// return AjaxResult.success(deviceInfoVo); +// } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java index 0cea1ae..d6b50e8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketInfoController.java @@ -19,7 +19,7 @@ import java.util.List; /** * 超市Controller * - * @author xsheng + * @author jsk * @date 2025-04-05 */ @Api(tags = "超市接口") @@ -30,6 +30,7 @@ public class SupermarketInfoController extends BaseController { private SupermarketInfoService supermarketInfoService; /** + * @author jsk * 查询超市列表 */ @ApiOperation(value = "查询超市列表") @@ -41,6 +42,7 @@ public class SupermarketInfoController extends BaseController { } /** + * @author jsk * 新增超市 */ @ApiOperation(value = "新增超市") @@ -57,6 +59,7 @@ public class SupermarketInfoController extends BaseController { } /** + * @author jsk * 修改超市 */ @ApiOperation(value = "修改超市") @@ -73,6 +76,7 @@ public class SupermarketInfoController extends BaseController { } /** + * @author jsk * 删除超市 */ @ApiOperation(value = "删除超市") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java index 2b4fd4c..b2926e4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketProductController.java @@ -18,7 +18,7 @@ import java.util.List; /** * 商品Controller * - * @author xsheng + * @author jsk * @date 2025-04-05 */ @Api(tags = "商品接口") @@ -29,6 +29,7 @@ public class SupermarketProductController extends BaseController { private SupermarketProductService supermarketProductService; /** + * @author jsk * 查询商品列表 */ @ApiOperation(value = "查询商品列表") @@ -40,6 +41,19 @@ public class SupermarketProductController extends BaseController { } /** + * @author jsk + * 查询未入超市商品列表 + */ + @ApiOperation(value = "查询未入超市商品列表") + @GetMapping("/nosupermarketlist") + public TableDataInfo nosupermarketlist(SupermarketProduct SupermarketProduct) { + startPage(); + List list = supermarketProductService.selectNoSupermarketProductList(SupermarketProduct); + return getDataTable(list); + } + + /** + * @author jsk * 新增商品 */ @ApiOperation(value = "新增商品") @@ -54,6 +68,22 @@ public class SupermarketProductController extends BaseController { } /** + * @author jsk + * 批量添加商品到超市 + */ + @ApiOperation(value = "修改商品") + @SysLog(title = "商品", businessType = OperaType.UPDATE, logType = 1,module = "商超管理->修改商品") + @PostMapping("/editbatch") + public AjaxResult editbatch(@RequestBody SupermarketProduct SupermarketProduct) { + try { + return toAjax(supermarketProductService.updateBatchSupermarketProduct(SupermarketProduct)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + + /** + * @author jsk * 修改商品 */ @ApiOperation(value = "修改商品") @@ -67,6 +97,7 @@ public class SupermarketProductController extends BaseController { } } /** + * @author jsk * 修改商品状态 */ @ApiOperation(value = "修改商品状态") @@ -81,7 +112,8 @@ public class SupermarketProductController extends BaseController { } /** - * 删除商品 + * @author jsk + * 批量删除商品 */ @ApiOperation(value = "批量删除商品") @SysLog(title = "商品", businessType = OperaType.DELETE, logType = 1,module = "商超管理->删除商品") @@ -89,6 +121,11 @@ public class SupermarketProductController extends BaseController { public AjaxResult removes(@RequestBody SupermarketProduct supermarketProducts) { return toAjax(supermarketProductService.deleteSupermarketProductByProductIds(supermarketProducts)); } + + /** + * @author jsk + * 删除商品 + */ @ApiOperation(value = "删除商品") @SysLog(title = "商品", businessType = OperaType.DELETE, logType = 1,module = "商超管理->删除商品") @PostMapping("/del") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketUnitController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketUnitController.java index 445a6d3..fc66406 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketUnitController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/controller/SupermarketUnitController.java @@ -17,7 +17,7 @@ import java.util.List; /** * 单位Controller * - * @author xsheng + * @author jsk * @date 2025-04-05 */ @Api(tags = "单位接口") @@ -28,6 +28,7 @@ public class SupermarketUnitController extends BaseController { private SupermarketUnitService supermarketUnitService; /** + * @author jsk * 查询单位列表 */ @ApiOperation(value = "查询单位列表") @@ -39,6 +40,7 @@ public class SupermarketUnitController extends BaseController { } /** + * @author jsk * 新增单位 */ @ApiOperation(value = "新增单位") @@ -53,6 +55,7 @@ public class SupermarketUnitController extends BaseController { } /** + * @author jsk * 修改单位 */ @ApiOperation(value = "修改单位") @@ -67,6 +70,7 @@ public class SupermarketUnitController extends BaseController { } /** + * @author jsk * 删除单位 */ @ApiOperation(value = "删除单位") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java index a67846b..b9b824e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/mapper/SupermarketProductMapper.java @@ -21,6 +21,7 @@ public interface SupermarketProductMapper { */ public List selectSupermarketProductList(SupermarketProduct productInfo); + public List selectNoSupermarketProductList(SupermarketProduct productInfo); /** * 新增商品 * diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/SupermarketProductService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/SupermarketProductService.java index 525b10e..a599edc 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/SupermarketProductService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/SupermarketProductService.java @@ -20,6 +20,8 @@ public interface SupermarketProductService { */ public List selectSupermarketProductList(SupermarketProduct productInfo); + public List selectNoSupermarketProductList(SupermarketProduct productInfo); + /** * 新增商品 * @@ -36,6 +38,8 @@ public interface SupermarketProductService { */ public int updateSupermarketProduct(SupermarketProduct productInfo); + public int updateBatchSupermarketProduct(SupermarketProduct productInfo); + public int updateSupermarketProductState(SupermarketProduct productInfo); /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java index ddf1cbe..874df45 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supermarket/service/impl/SupermarketProductServiceImpl.java @@ -32,6 +32,10 @@ public class SupermarketProductServiceImpl implements SupermarketProductService return supermarketProductMapper.selectSupermarketProductList(SupermarketProduct); } + @Override + public List selectNoSupermarketProductList(SupermarketProduct SupermarketProduct) { + return supermarketProductMapper.selectNoSupermarketProductList(SupermarketProduct); + } /** * 新增商品 * @@ -64,6 +68,22 @@ public class SupermarketProductServiceImpl implements SupermarketProductService } } + @Override + public int updateBatchSupermarketProduct(SupermarketProduct supermarketProduct) { + supermarketProduct.setUpdateTime(DateUtils.getNowDate()); + try { + int kk=0; + String[] productids=supermarketProduct.getProductId().split(","); + for(int i=0;i list = wareHouseCategoryService.selectWareHouseCategoryList(WareHouseCategory); + return getDataTable(list); + } + + /** + * @author jsk + * 新增库存类别 + */ + @ApiOperation(value = "新增库存类别") + //@PreventRepeatSubmit + //@RequiresPermissions("WareHouse:info:add") + @SysLog(title = "库存类别", businessType = OperaType.INSERT, logType = 1,module = "库存管理->新增库存类别") + @PostMapping("/add") + public AjaxResult add(@RequestBody WareHouseCategory WareHouseCategory) { + try { + return toAjax(wareHouseCategoryService.insertWareHouseCategory(WareHouseCategory)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + + /** + * @author jsk + * 修改库存类别 + */ + @ApiOperation(value = "修改库存类别") + @SysLog(title = "库存类别", businessType = OperaType.UPDATE, logType = 1,module = "库存管理->修改库存类别") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody WareHouseCategory WareHouseCategory) { + try { + return toAjax(wareHouseCategoryService.updateWareHouseCategory(WareHouseCategory)); + } catch (Exception e) { + return error("系统错误, " + e.getMessage()); + } + } + + /** + * @author jsk + * 删除库存类别 + */ + @ApiOperation(value = "删除库存类别") + @SysLog(title = "库存类别", businessType = OperaType.DELETE, logType = 1,module = "库存管理->删除库存类别") + @PostMapping("/del") + public AjaxResult remove(@RequestBody WareHouseCategory WareHouseCategory) { + return toAjax(wareHouseCategoryService.deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory)); + } + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/controller/WareHouseInfoController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/controller/WareHouseInfoController.java index 2cc48a4..47b411b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/controller/WareHouseInfoController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/controller/WareHouseInfoController.java @@ -17,7 +17,7 @@ import java.util.List; /** * 仓库Controller * - * @author xsheng + * @author jsk * @date 2025-04-05 */ @Api(tags = "仓库接口") @@ -28,6 +28,7 @@ public class WareHouseInfoController extends BaseController { private WareHouseInfoService wareHouseInfoService; /** + * @author jsk * 查询仓库列表 */ @ApiOperation(value = "查询仓库列表") @@ -39,12 +40,13 @@ public class WareHouseInfoController extends BaseController { } /** + * @author jsk * 新增仓库 */ @ApiOperation(value = "新增仓库") //@PreventRepeatSubmit //@RequiresPermissions("WareHouse:info:add") - @SysLog(title = "仓库", businessType = OperaType.INSERT, logType = 1,module = "商超管理->新增仓库") + @SysLog(title = "仓库", businessType = OperaType.INSERT, logType = 1,module = "库存管理->新增仓库") @PostMapping("/add") public AjaxResult add(@RequestBody WareHouseInfo WareHouseInfo) { try { @@ -55,12 +57,11 @@ public class WareHouseInfoController extends BaseController { } /** + * @author jsk * 修改仓库 */ @ApiOperation(value = "修改仓库") - //@PreventRepeatSubmit - //@RequiresPermissions("WareHouse:info:edit") - @SysLog(title = "仓库", businessType = OperaType.UPDATE, logType = 1,module = "商超管理->修改仓库") + @SysLog(title = "仓库", businessType = OperaType.UPDATE, logType = 1,module = "库存管理->修改仓库") @PostMapping("/edit") public AjaxResult edit(@RequestBody WareHouseInfo WareHouseInfo) { try { @@ -71,15 +72,14 @@ public class WareHouseInfoController extends BaseController { } /** + * @author jsk * 删除仓库 */ @ApiOperation(value = "删除仓库") - //@PreventRepeatSubmit - //@RequiresPermissions("WareHouse:info:remove") - @SysLog(title = "仓库", businessType = OperaType.DELETE, logType = 1,module = "商超管理->删除仓库") + @SysLog(title = "仓库", businessType = OperaType.DELETE, logType = 1,module = "库存管理->删除仓库") @PostMapping("/del") - public AjaxResult remove(@PathVariable Long WareHouseId) { - return toAjax(wareHouseInfoService.deleteWareHouseInfoByWareHouseId(WareHouseId)); + public AjaxResult remove(@RequestBody WareHouseInfo WareHouseInfo) { + return toAjax(wareHouseInfoService.deleteWareHouseInfoByWareHouseId(WareHouseInfo)); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseCategory.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseCategory.java new file mode 100644 index 0000000..d9504d7 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseCategory.java @@ -0,0 +1,28 @@ +package com.bonus.canteen.core.warehouse.domain; + +import com.bonus.common.core.web.domain.BaseEntity; +import lombok.Data; +import lombok.ToString; + +/** + * 超市对象 orderInfo + * + * @author xsheng + * @date 2025-04-05 + */ + + +@Data +@ToString +public class WareHouseCategory extends BaseEntity { + private static final long serialVersionUID = 1L; + + private String categoryId ; + private String areaId ; + private String areaName ; + private String categoryName ; + private String delFlag ; + private String createBy ; + private String updateBy ; + +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseInfo.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseInfo.java index c9e538f..6035747 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseInfo.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/domain/WareHouseInfo.java @@ -28,7 +28,8 @@ public class WareHouseInfo extends BaseEntity { private String warehouseType ; private String status ; private String delFlag ; - private String typeId ; + private String categoryId ; + private String categoryName ; private String areaId ; private String revision ; private String createBy ; @@ -38,5 +39,6 @@ public class WareHouseInfo extends BaseEntity { private String parentId ; private String canteenId ; private String fetchUserId ; + private String userName ; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseCategoryMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseCategoryMapper.java new file mode 100644 index 0000000..e2d1be6 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseCategoryMapper.java @@ -0,0 +1,55 @@ +package com.bonus.canteen.core.warehouse.mapper; + + +import com.bonus.canteen.core.warehouse.domain.WareHouseCategory; + +import java.util.List; + +/** + * 仓库Mapper接口 + * + * @author xsheng + * @date 2025-04-05 + */ +public interface WareHouseCategoryMapper { + + /** + * 查询仓库列表 + * + * @param wareHouseCategory 仓库 + * @return 仓库集合 + */ + public List selectWareHouseCategoryList(WareHouseCategory wareHouseCategory); + + /** + * 新增仓库 + * + * @param wareHouseCategory 仓库 + * @return 结果 + */ + public int insertWareHouseCategory(WareHouseCategory wareHouseCategory); + + /** + * 修改仓库 + * + * @param wareHouseCategory 仓库 + * @return 结果 + */ + public int updateWareHouseCategory(WareHouseCategory wareHouseCategory); + + /** + * 删除仓库 + * + * @param wareHouseId 仓库主键 + * @return 结果 + */ + public int deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory WareHouseCategory); + + /** + * 批量删除仓库 + * + * @param wareHouseIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteWareHouseCategoryByWareHouseIds(Long[] wareHouseIds); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseInfoMapper.java index e8a1cad..0d269a0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/mapper/WareHouseInfoMapper.java @@ -40,10 +40,10 @@ public interface WareHouseInfoMapper { /** * 删除仓库 * - * @param wareHouseId 仓库主键 + * @param WareHouseInfo 仓库主键 * @return 结果 */ - public int deleteWareHouseInfoByWareHouseId(Long wareHouseId); + public int deleteWareHouseInfoByWareHouseId(WareHouseInfo WareHouseInfo); /** * 批量删除仓库 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseCategoryService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseCategoryService.java new file mode 100644 index 0000000..a341ee7 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseCategoryService.java @@ -0,0 +1,54 @@ +package com.bonus.canteen.core.warehouse.service; + +import com.bonus.canteen.core.warehouse.domain.WareHouseCategory; + +import java.util.List; + +/** + * 仓库Service接口 + * + * @author xsheng + * @date 2025-04-05 + */ +public interface WareHouseCategoryService { + + /** + * 查询仓库列表 + * + * @param wareHouseCategory 仓库 + * @return 仓库集合 + */ + public List selectWareHouseCategoryList(WareHouseCategory wareHouseCategory); + + /** + * 新增仓库 + * + * @param wareHouseCategory 仓库 + * @return 结果 + */ + public int insertWareHouseCategory(WareHouseCategory wareHouseCategory); + + /** + * 修改仓库 + * + * @param wareHouseCategory 仓库 + * @return 结果 + */ + public int updateWareHouseCategory(WareHouseCategory wareHouseCategory); + + /** + * 批量删除仓库 + * + * @param wareHouseIds 需要删除的仓库主键集合 + * @return 结果 + */ + public int deleteWareHouseCategoryByWareHouseIds(Long[] wareHouseIds); + + /** + * 删除仓库信息 + * + * @param wareHouseId 仓库主键 + * @return 结果 + */ + public int deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory WareHouseCategory); +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseInfoService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseInfoService.java index d730f37..92b55f4 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseInfoService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/WareHouseInfoService.java @@ -50,5 +50,5 @@ public interface WareHouseInfoService { * @param wareHouseId 仓库主键 * @return 结果 */ - public int deleteWareHouseInfoByWareHouseId(Long wareHouseId); + public int deleteWareHouseInfoByWareHouseId(WareHouseInfo WareHouseInfo); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseCategoryServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseCategoryServiceImpl.java new file mode 100644 index 0000000..707d160 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseCategoryServiceImpl.java @@ -0,0 +1,88 @@ +package com.bonus.canteen.core.warehouse.service.impl; + +import com.bonus.canteen.core.warehouse.domain.WareHouseCategory; +import com.bonus.canteen.core.warehouse.mapper.WareHouseCategoryMapper; +import com.bonus.canteen.core.warehouse.service.WareHouseCategoryService; +import com.bonus.common.core.exception.ServiceException; +import com.bonus.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 仓库Service业务层处理 + * + * @author xsheng + * @date 2025-04-05 + */ +@Service +public class WareHouseCategoryServiceImpl implements WareHouseCategoryService { + @Autowired + private WareHouseCategoryMapper wareHouseCategoryMapper; + + /** + * 查询仓库列表 + * + * @param WareHouseCategory 仓库 + * @return 仓库 + */ + @Override + public List selectWareHouseCategoryList(WareHouseCategory WareHouseCategory) { + return wareHouseCategoryMapper.selectWareHouseCategoryList(WareHouseCategory); + } + + /** + * 新增仓库 + * + * @param WareHouseCategory 仓库 + * @return 结果 + */ + @Override + public int insertWareHouseCategory(WareHouseCategory WareHouseCategory) { + WareHouseCategory.setCreateTime(DateUtils.getNowDate()); + try { + return wareHouseCategoryMapper.insertWareHouseCategory(WareHouseCategory); + } catch (Exception e) { + throw new ServiceException("错误信息描述"); + } + } + + /** + * 修改仓库 + * + * @param WareHouseCategory 仓库 + * @return 结果 + */ + @Override + public int updateWareHouseCategory(WareHouseCategory WareHouseCategory) { + WareHouseCategory.setUpdateTime(DateUtils.getNowDate()); + try { + return wareHouseCategoryMapper.updateWareHouseCategory(WareHouseCategory); + } catch (Exception e) { + throw new ServiceException("错误信息描述"); + } + } + + /** + * 批量删除仓库 + * + * @param WareHouseIds 需要删除的仓库主键 + * @return 结果 + */ + @Override + public int deleteWareHouseCategoryByWareHouseIds(Long[] WareHouseIds) { + return wareHouseCategoryMapper.deleteWareHouseCategoryByWareHouseIds(WareHouseIds); + } + + /** + * 删除仓库信息 + * + * @param WareHouseId 仓库主键 + * @return 结果 + */ + @Override + public int deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory WareHouseCategory) { + return wareHouseCategoryMapper.deleteWareHouseCategoryByWareHouseCategoryId(WareHouseCategory); + } +} diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseInfoServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseInfoServiceImpl.java index 6af1baa..d0a9431 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseInfoServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/warehouse/service/impl/WareHouseInfoServiceImpl.java @@ -82,7 +82,7 @@ public class WareHouseInfoServiceImpl implements WareHouseInfoService { * @return 结果 */ @Override - public int deleteWareHouseInfoByWareHouseId(Long WareHouseId) { - return wareHouseInfoMapper.deleteWareHouseInfoByWareHouseId(WareHouseId); + public int deleteWareHouseInfoByWareHouseId(WareHouseInfo WareHouseInfo) { + return wareHouseInfoMapper.deleteWareHouseInfoByWareHouseId(WareHouseInfo); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml index 29d47f0..2305900 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/supermarket/SupermarketProductMapper.xml @@ -39,18 +39,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + insert into supermarket_product diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseCategoryMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseCategoryMapper.xml new file mode 100644 index 0000000..e348753 --- /dev/null +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseCategoryMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + insert into warehouse_category + + area_id , + category_name , + create_by , + create_time , + update_by , + update_time , + + + #{areaId }, + #{categoryName }, + #{createBy }, + #{createTime }, + #{updateBy }, + #{updateTime }, + + + + + update warehouse_category + + area_id =#{areaId }, + category_name =#{categoryName }, + update_by =#{updateBy }, + update_time =#{updateTime }, + + where category_id = #{categoryId} + + + + delete from warehouse_category where category_id = #{categoryId} + + + + delete from warehouse_category where category_id in + + #{categoryId} + + + \ No newline at end of file diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseInfoMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseInfoMapper.xml index 5896171..5abd522 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseInfoMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/warehouse/WareHouseInfoMapper.xml @@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -30,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select warehouse_id,warehouse_num,warehouse_name,user_id,region_province,region_city,region_district,address,warehouse_type,status,del_flag,type_id,area_id,revision,create_by,create_time,update_by,update_time,if_use_warehouse_area,if_use_warehouse_location,parent_id,canteen_id,fetch_user_id from warehouse_info + select warehouse_id,warehouse_num,warehouse_name,user_id,region_province,region_city,region_district,address,warehouse_type,status,del_flag,category_id,area_id,revision,create_by,create_time,update_by,update_time,if_use_warehouse_area,if_use_warehouse_location,parent_id,canteen_id,fetch_user_id from warehouse_info