diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierBankRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierBankRest.java new file mode 100644 index 0000000..9315e34 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierBankRest.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierbank.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt-(供应商管理)
+ * File: SupplierBankFeignFallback.java
+ * Class: com.yxt..biz.supplierbank.SupplierBankRest
+ * Description: 供应商开户行信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商开户行信息") +@RestController +@RequestMapping("/apiadmin/supplierbank") +public class SupplierBankRest { + + @Autowired + private SupplierBankService supplierBankService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return supplierBankService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierBankDto dto){ + ResultBean rb = ResultBean.fireFail(); + supplierBankService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierBankService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return supplierBankService.fetchDetailsVoBySid(sid); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierFileRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierFileRest.java new file mode 100644 index 0000000..5312af0 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierFileRest.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierfile.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt-(仓储基础信息供应商)
+ * File: SupplierFileFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.supplierfile.SupplierFileRest
+ * Description: 供应商附件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商附件") +@RestController +@RequestMapping("/apiadmin/supplierfile") +public class SupplierFileRest { + + @Autowired + private SupplierFileService supplierFileService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return supplierFileService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierFileDto dto){ + ResultBean rb = ResultBean.fireFail(); + supplierFileService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierFileService.delAll(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return supplierFileService.fetchDetailsVoBySid(sid); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseSupplierInfoRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierInfoRest.java similarity index 84% rename from wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseSupplierInfoRest.java rename to wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierInfoRest.java index 107a19d..b48de08 100644 --- a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseSupplierInfoRest.java +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierInfoRest.java @@ -28,7 +28,7 @@ package com.yxt.wms.apiadmin.aggregation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.func.basesupplierinfo.*; +import com.yxt.wms.biz.func.supplierinfo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -51,22 +51,22 @@ import java.util.List; */ @Api(tags = "供应商信息") @RestController -@RequestMapping("/apiadmin/base/basesupplierinfo") -public class BaseSupplierInfoRest { +@RequestMapping("/apiadmin/supplierinfo") +public class SupplierInfoRest { @Autowired - private BaseSupplierInfoService baseSupplierInfoService; + private SupplierInfoService baseSupplierInfoService; @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ + public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); return baseSupplierInfoService.listPageVo(pq); } @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody BaseSupplierInfoDto dto){ + public ResultBean save(@RequestBody SupplierInfoDto dto){ return baseSupplierInfoService.saveOrUpdateDto(dto); } @@ -80,13 +80,13 @@ public class BaseSupplierInfoRest { @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ return baseSupplierInfoService.fetchDetailsVoBySid(sid); } @ApiOperation("选择供应商") @PostMapping("/choiceSupplierInfo") - public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){ + public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){ return baseSupplierInfoService.choiceSupplierInfo(createOrgSid); } } diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java new file mode 100644 index 0000000..5ac8f6d --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/SupplierTypeRest.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.suppliertype.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt-(仓储基础信息供应商)
+ * File: SupplierTypeFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.suppliertype.SupplierTypeRest
+ * Description: 供应商类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "供应商类型") +@RestController +@RequestMapping("/apiadmin/suppliertype") +public class SupplierTypeRest { + + @Autowired + private SupplierTypeService supplierTypeService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + return supplierTypeService.listPageVo(pq); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierTypeDto dto){ + return supplierTypeService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + supplierTypeService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return supplierTypeService.fetchDetailsVoBySid(sid); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryCheckbillRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryCheckbillRest.java new file mode 100644 index 0000000..08d6ba6 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryCheckbillRest.java @@ -0,0 +1,96 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; + +import com.yxt.wms.biz.func.warehouseinventorycheckbill.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * Project: yxt-Warehouse(仓储)
+ * File: WarehouseInventoryCheckbillFeignFallback.java
+ * Class: com.yxt.Warehouse.biz.Warehouseinventorycheckbill.WarehouseInventoryCheckbillRest
+ * Description: 库存盘点.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库存盘点") +@RestController +@RequestMapping("v1/warehouseinventorycheckbill") +public class WarehouseInventoryCheckbillRest { + + @Autowired + private WarehouseInventoryCheckbillService warehouseInventoryCheckbillService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = warehouseInventoryCheckbillService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseInventoryCheckbillDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseInventoryCheckbillService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + warehouseInventoryCheckbillService.delBySids(sids); + return rb.success(); + } + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + return warehouseInventoryCheckbillService.fetchDetailsVoBySid(sid); + } + + @ApiOperation("盘点") + @PostMapping("/inven") + public ResultBean inven(@RequestBody WarehouseInventoryCheckbillDto dto){ + ResultBean rb = ResultBean.fireFail(); + warehouseInventoryCheckbillService.inven(dto); + return rb.success(); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java new file mode 100644 index 0000000..ba7703f --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java @@ -0,0 +1,119 @@ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.base.utils.ExportExcelUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehousesinventory.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/28 10:51 + */ +@Api(tags = "库存信息") +@RestController +@RequestMapping("/apiadmin/warehouseinventory") +public class WarehouseInventoryRest { + + @Autowired + WarehouseInventoryService warehouseInventoryService; + @Autowired + HttpServletResponse response; + + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + return warehouseInventoryService.listPage(pq); + } + + @ApiOperation("删除/批量删除") + @DeleteMapping("/delBySids") + ResultBean delBySids(@RequestBody String[] sids) { + return warehouseInventoryService.delAllBySids(sids); + } + + + + @PostMapping("/exportExcel") + @ApiOperation(value = "导出") + public void exportExcel(@RequestBody WarehouseInventoryQuery query) { + warehouseInventoryService.listExcel(query); + } + + @ApiOperation("修改库存数量") + @PostMapping("/updateInventoryCount") + ResultBean updateInventoryCount(@RequestBody WarehouseUpdateCountQuery query) { + return warehouseInventoryService.updateInventoryCount(query); + } + + @ApiOperation("销售开单选择商品分页列表") + @PostMapping("/listPageSales") + public ResultBean> listPageSales(@RequestBody PagerQuery pq) { + return warehouseInventoryService.listPageSales(pq); + } + + @ApiOperation("查询部门下所有的商品信息") + @PostMapping("/getPackageGoodsVo") + public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq) { + return warehouseInventoryService.getPackageGoodsVo(pq); + } + + @ApiOperation("库龄查询") + @PostMapping("/inventoryAgeList") + public ResultBean> inventoryAgeList(@RequestBody PagerQuery pq) { + return warehouseInventoryService.inventoryAgeList(pq); + } + + @PostMapping("/ageExportExcel") + @ApiOperation(value = "库龄查询导出") + public void ageExportExcel(@RequestBody WarehouseInventoryAgeQuery query) { + warehouseInventoryService.ageExportExcel(query); + } + + @ApiOperation("根据商品sid查询库存信息") + @PostMapping("/selectInvenBySkuSid") + public ResultBean selectInvenBySkuSid(@RequestParam("skuSid") String skuSid) { + return warehouseInventoryService.selectInvenBySkuSid(skuSid); + } + + @ApiOperation("盘库商品分页列表") + @PostMapping("/invenGoodsListPage") + public ResultBean> invenGoodsListPage(@RequestBody PagerQuery pq) { + return warehouseInventoryService.invenGoodsListPage(pq); + } + + @ApiOperation("调拨商品分页列表") + @PostMapping("/alloGoodsListPage") + public ResultBean> alloGoodsListPage(@RequestBody PagerQuery pq) { + return warehouseInventoryService.alloGoodsListPage(pq); + } + + @ApiOperation("旧件返厂商品分页列表") + @PostMapping("/returnGoodsListPage") + public ResultBean> returnGoodsListPage(@RequestBody PagerQuery pq) { + return warehouseInventoryService.returnGoodsListPage(pq); + } + + @ApiOperation("旧件处理商品分页列表") + @PostMapping("/handleGoodsListPage") + public ResultBean> handleGoodsListPage(@RequestBody PagerQuery pq) { + return warehouseInventoryService.handleGoodsListPage(pq); + } + + @ApiOperation("根据Sid获取库存实体") + @PostMapping("/fetchEntityBySid") + ResultBean fetchEntityBySid(@RequestParam("sid") String sid) { + return warehouseInventoryService.fetchEntityBySid(sid); + } + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java new file mode 100644 index 0000000..0a212bf --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java @@ -0,0 +1,54 @@ +package com.yxt.Warehouse.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseoutbill.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Api(tags = "出库单据") +@RestController +@RequestMapping("/apiadmin/warehouseoutbill") +public class WarehouseOutBillRest { + + @Autowired + private WarehouseOutBillService warehouseOutBillService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery) { + return warehouseOutBillService.listPage(pagerQuery); + } + + @ApiOperation("出库保存修改") + @PostMapping("/saveOrUpdateOutBill") + ResultBean saveOrUpdateOutBill(@RequestBody WarehouseOutBillDto dto) { + return warehouseOutBillService.saveOrUpdateOutBill(dto); + } + + @ApiOperation("详情") + @GetMapping("/details") + ResultBean details(@RequestParam("sid") String sid) { + return warehouseOutBillService.details(sid); + } + + @ApiOperation("选择商品分页列表") + @PostMapping("/getInventoryList") + ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery) { + return warehouseOutBillService.getInventoryList(pagerQuery); + } + + @ApiOperation("确认") + @PostMapping("/confirm") + ResultBean confirm(@RequestBody WarehouseOutBillDto dto) { + return warehouseOutBillService.confirm(dto); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java deleted file mode 100644 index fd67ada..0000000 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java +++ /dev/null @@ -1,112 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.yxt.common.core.domain.BaseEntity; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfo
- * Description: 供应商信息.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息", description = "供应商信息") -@TableName("base_supplier_info") -public class BaseSupplierInfo extends BaseEntity { - private static final long serialVersionUID = 1L; - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - -} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java deleted file mode 100644 index 850879c..0000000 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java +++ /dev/null @@ -1,116 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; - - -import com.yxt.common.core.vo.Vo; -import com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankDetailsVo; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 视图数据详情", description = "供应商信息 视图数据详情") -public class BaseSupplierInfoDetailsVo implements Vo { - - private String sid; // sid - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("供应商开户行") - private List baseSupplierBankList; -} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java deleted file mode 100644 index 4cddb64..0000000 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java +++ /dev/null @@ -1,116 +0,0 @@ -/********************************************************* - ********************************************************* - ******************** ******************* - ************* ************ - ******* _oo0oo_ ******* - *** o8888888o *** - * 88" . "88 * - * (| -_- |) * - * 0\ = /0 * - * ___/`---'\___ * - * .' \\| |// '. * - * / \\||| : |||// \ * - * / _||||| -:- |||||- \ * - * | | \\\ - /// | | * - * | \_| ''\---/'' |_/ | * - * \ .-\__ '-' ___/-. / * - * ___'. .' /--.--\ `. .'___ * - * ."" '< `.___\_<|>_/___.' >' "". * - * | | : `- \`.;`\ _ /`;.`/ - ` : | | * - * \ \ `_. \_ __\ /__ _/ .-` / / * - * =====`-.____`.___ \_____/___.-`___.-'===== * - * `=---=' * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* - *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; - - -import com.yxt.common.core.dto.Dto; -import com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankDto; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoDto.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoDto
- * Description: 供应商信息 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ -@Data -@ApiModel(value = "供应商信息 数据传输对象", description = "供应商信息 数据传输对象") -public class BaseSupplierInfoDto implements Dto { - - private String sid; // sid - - @ApiModelProperty("编码") - private String supplierCode; // 编码 - @ApiModelProperty("供应商名称") - private String supplierName; // 供应商名称 - @ApiModelProperty("供应商名称拼音") - private String supplierPY; // 供应商名称拼音 - @ApiModelProperty("供应商类型sid") - private String supplierTypeSid; // 供应商类型sid - @ApiModelProperty("供应商类型") - private String supplierTypeName; // 供应商类型 - @ApiModelProperty("省sid") - private String provinceSid; // 省sid - @ApiModelProperty("province") - private String province; // - @ApiModelProperty("市sid") - private String citySid; // 市sid - @ApiModelProperty("city") - private String city; // - @ApiModelProperty("收货县区sid") - private String countySid; // 收货县区sid - @ApiModelProperty("county") - private String county; // - @ApiModelProperty("详细地址") - private String address; // 详细地址 - @ApiModelProperty("手机") - private String contactMobile; // 手机 - @ApiModelProperty("电话") - private String contactTelePhone; // 电话 - @ApiModelProperty("联系人") - private String contactName; // 联系人 - @ApiModelProperty("传真") - private String fax; // 传真 - @ApiModelProperty("邮编") - private String zipCode; // 邮编 - @ApiModelProperty("电子邮件") - private String email; // 电子邮件 - @ApiModelProperty("网址") - private String website; // 网址 - @ApiModelProperty("开票公司名称") - private String billingCompanyName; // 开票公司名称 - @ApiModelProperty("税号") - private String registNum; // 税号 - @ApiModelProperty("法人") - private String legalName; // 法人 - @ApiModelProperty("采购员") - private String purchaser; // 采购员 - @ApiModelProperty("排序") - private Integer sortNo; // 排序 - @ApiModelProperty("开票类型key") - private String billingTypeKey; // 开票类型key - @ApiModelProperty("开票类型value") - private String billingTypeValue; // 开票类型value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("开户行信息") - private List baseSupplierBankList; -} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml deleted file mode 100644 index 90efe5d..0000000 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBank.java similarity index 97% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBank.java index cdac86b..4959a9b 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBank.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierBank; +package com.yxt.wms.biz.func.supplierbank; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; @@ -47,7 +47,7 @@ import lombok.Data; @Data @ApiModel(value = "供应商开户行信息", description = "供应商开户行信息") @TableName("base_supplier_bank") -public class BaseSupplierBank extends BaseEntity { +public class SupplierBank extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("供应商sid") diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankDetailsVo.java similarity index 96% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankDetailsVo.java index d220942..1fb71a5 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankDetailsVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierBank; +package com.yxt.wms.biz.func.supplierbank; import com.yxt.common.core.vo.Vo; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "供应商开户行信息 视图数据详情", description = "供应商开户行信息 视图数据详情") -public class BaseSupplierBankDetailsVo implements Vo { +public class SupplierBankDetailsVo implements Vo { private String sid; // sid diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankDto.java similarity index 96% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankDto.java index 38d8fb7..28bc646 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankDto.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierBank; +package com.yxt.wms.biz.func.supplierbank; import com.yxt.common.core.dto.Dto; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "供应商开户行信息 数据传输对象", description = "供应商开户行信息 数据传输对象") -public class BaseSupplierBankDto implements Dto { +public class SupplierBankDto implements Dto { private String sid; // sid diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankMapper.java similarity index 84% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankMapper.java index d9d9e27..758ec29 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankMapper.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierBank; +package com.yxt.wms.biz.func.supplierbank; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -50,18 +50,18 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface BaseSupplierBankMapper extends BaseMapper { +public interface SupplierBankMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from base_supplier_bank") - List selectListVo(); + List selectListVo(); @Delete("delete from base_supplier_bank where supplierSid = #{supplierSid}") int deleteBySupplierSid(String supplierSid); @Select("select * from base_supplier_bank where supplierSid = #{supplierSid}") - List selectBySupplierSid(String supplierSid); + List selectBySupplierSid(String supplierSid); } \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankMapper.xml similarity index 57% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankMapper.xml index cd0de0a..90a2750 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankMapper.xml @@ -1,13 +1,13 @@ - + - SELECT * FROM base_supplier_bank ${ew.sqlSegment} - SELECT * FROM base_supplier_bank ${ew.sqlSegment} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankQuery.java similarity index 96% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankQuery.java index 7c3c71e..c6e0f45 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierBank; +package com.yxt.wms.biz.func.supplierbank; import com.yxt.common.core.query.Query; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "供应商开户行信息 查询条件", description = "供应商开户行信息 查询条件") -public class BaseSupplierBankQuery implements Query { +public class SupplierBankQuery implements Query { @ApiModelProperty("供应商sid") private String supplierSid; // 供应商sid diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankService.java new file mode 100644 index 0000000..26ad063 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankService.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.supplierbank; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.supplier.supplierbank.SupplierBankFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: yxt-base(供应商管理)
+ * File: BaseSupplierBankService.java
+ * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankService
+ * Description: 供应商开户行信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SupplierBankService extends MybatisBaseService { + @Autowired + SupplierBankFeign supplierBankFeign; + public ResultBean> listPageVo(PagerQuery pq) { + return supplierBankFeign.listPage(pq); + } + + public ResultBean saveOrUpdateDto(SupplierBankDto dto){ + return supplierBankFeign.save(dto); + } + + public ResultBean fetchDetailsVoBySid(String sid){ + return supplierBankFeign.fetchDetailsBySid(sid); + } + + public ResultBean delAll(String[] sids) { + return supplierBankFeign.delBySids(sids); + } + + +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankVo.java similarity index 97% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankVo.java index 2141c91..0c64756 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierBank; +package com.yxt.wms.biz.func.supplierbank; import com.yxt.common.core.vo.Vo; @@ -46,7 +46,7 @@ import lombok.Data; */ @Data @ApiModel(value = "供应商开户行信息 视图数据对象", description = "供应商开户行信息 视图数据对象") -public class BaseSupplierBankVo implements Vo { +public class SupplierBankVo implements Vo { private String sid; // sid diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFile.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFile.java new file mode 100644 index 0000000..b7d07af --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFile.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.supplierfile; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFile.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFile
+ * Description: 供应商附件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件", description = "供应商附件") +@TableName("base_supplier_file") +public class SupplierFile extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileDetailsVo.java new file mode 100644 index 0000000..6eb6565 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileDetailsVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.supplierfile; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileVo.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
+ * Description: 供应商附件 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 视图数据详情", description = "供应商附件 视图数据详情") +public class SupplierFileDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileDto.java new file mode 100644 index 0000000..099f724 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.supplierfile; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileDto.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileDto
+ * Description: 供应商附件 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 数据传输对象", description = "供应商附件 数据传输对象") +public class SupplierFileDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileMapper.java similarity index 71% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileMapper.java index a9d114a..31781c3 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileMapper.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; +package com.yxt.wms.biz.func.supplierfile; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -32,15 +32,14 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; import java.util.List; /** * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierInfoMapper.java
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoMapper
- * Description: 供应商信息.
+ * File: BaseSupplierFileMapper.java
+ * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileMapper
+ * Description: 供应商附件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2024-03-13 16:51:56
@@ -50,18 +49,12 @@ import java.util.List; * @since 1.0 */ @Mapper -public interface BaseSupplierInfoMapper extends BaseMapper { +public interface SupplierFileMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - @Select("select * from base_supplier_info") - List selectListVo(); - - @Update("update base_supplier_info set isDelete = '1' where sid = #{sid}") - int updateBySidIsDelete(String sid); - - @Select("select * from base_supplier_info") - List choiceSupplierInfo(String createOrgSid); + @Select("select * from base_supplier_file") + List selectListVo(); } \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileMapper.xml new file mode 100644 index 0000000..2e903c7 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileQuery.java new file mode 100644 index 0000000..15037a0 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileQuery.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.supplierfile; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileQuery.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileQuery
+ * Description: 供应商附件 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 查询条件", description = "供应商附件 查询条件") +public class SupplierFileQuery implements Query { + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileService.java similarity index 58% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileService.java index 9e85f8f..2d5666c 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileService.java @@ -23,23 +23,26 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; +package com.yxt.wms.biz.func.supplierfile; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign; +import com.yxt.wms.feign.supplier.supplierfile.SupplierFileFeign; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - /** * Project: yxt-base(仓储基础信息供应商)
- * File: BaseSupplierInfoService.java
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoService
- * Description: 供应商信息 业务逻辑.
+ * File: BaseSupplierFileService.java
+ * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileService
+ * Description: 供应商附件 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
* Makedate: 2024-03-13 16:51:56
@@ -49,40 +52,22 @@ import java.util.List; * @since 1.0 */ @Service -public class BaseSupplierInfoService extends MybatisBaseService { - -// @Autowired -// private SysStaffOrgFeign sysStaffOrgFeign; -// @Autowired -// private SysOrganizationFeign sysOrganizationFeign; -// @Autowired -// private BaseSupplierBankService baseSupplierBankService; +public class SupplierFileService extends MybatisBaseService { @Autowired - BaseSupplierInfoFeign baseSupplierInfoFeign; - - public ResultBean> listPageVo(PagerQuery pq) { - BaseSupplierInfoQuery query = pq.getParams(); - return baseSupplierInfoFeign.listPage(pq); + SupplierFileFeign supplierFileFeign; + public ResultBean> listPageVo(PagerQuery pq) { + return supplierFileFeign.listPage(pq); } - public ResultBean saveOrUpdateDto(BaseSupplierInfoDto dto){ - return baseSupplierInfoFeign.save(dto); + public ResultBean saveOrUpdateDto(SupplierFileDto dto){ + return supplierFileFeign.save(dto); } - - public ResultBean fetchDetailsVoBySid(String sid){ - return baseSupplierInfoFeign.fetchDetailsBySid(sid); + public ResultBean delAll(String[] sids ){ + return supplierFileFeign.delBySids(sids); } - public void delAll(String[] sids) { - for (String sid : sids) { - //删除厂商基础信息 - int count = baseMapper.updateBySidIsDelete(sid); - //删除厂商开户行信息 -// int i = baseSupplierBankService.deleteBySupplierSid(sid); - } - } + public ResultBean fetchDetailsVoBySid(String sid){ - public ResultBean> choiceSupplierInfo(String createOrgSid) { - return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid); + return supplierFileFeign.fetchDetailsBySid(sid); } } \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileVo.java new file mode 100644 index 0000000..b7bbd29 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileVo.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.supplierfile; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierFileVo.java
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo
+ * Description: 供应商附件 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商附件 视图数据对象", description = "供应商附件 视图数据对象") +public class SupplierFileVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("文件名") + private String fileName; // 文件名 + @ApiModelProperty("文件类型") + private String fileType; // 文件类型 + @ApiModelProperty("关联业务对象sid") + private String linkSid; // 关联业务对象sid + @ApiModelProperty("附件类型") + private String attachType; // 附件类型 + @ApiModelProperty("文件大小") + private String fileSize; // 文件大小 + @ApiModelProperty("文件的路径") + private String filePath; // 文件的路径 + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfo.java similarity index 99% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfo.java index c7f9bda..fec0ae3 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoChoice.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoChoice.java similarity index 98% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoChoice.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoChoice.java index a226445..6868bff 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoChoice.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoChoice.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.yxt.common.core.vo.Vo; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDetailsVo.java similarity index 95% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDetailsVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDetailsVo.java index 0458089..772f7be 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDetailsVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDetailsVo.java @@ -23,10 +23,11 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.yxt.common.core.vo.Vo; +import com.yxt.wms.biz.func.supplierbank.SupplierBankDetailsVo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -110,4 +111,6 @@ public class SupplierInfoDetailsVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("供应商开户行") + private List baseSupplierBankList; } \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDto.java similarity index 95% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDto.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDto.java index e604552..85cc645 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDto.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoDto.java @@ -23,10 +23,11 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.yxt.common.core.dto.Dto; +import com.yxt.wms.biz.func.supplierbank.SupplierBankDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -110,4 +111,6 @@ public class SupplierInfoDto implements Dto { private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + @ApiModelProperty("开户行信息") + private List baseSupplierBankList; } \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoMapper.java similarity index 98% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoMapper.java index c498292..e1490d5 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoMapper.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoMapper.xml similarity index 58% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.xml rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoMapper.xml index d37d100..793152e 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.xml +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoMapper.xml @@ -1,13 +1,13 @@ - + - SELECT * FROM base_supplier_info ${ew.sqlSegment} - SELECT * FROM base_supplier_info ${ew.sqlSegment} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoQuery.java similarity index 98% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoQuery.java index 25c951b..8fd0ba2 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.yxt.common.core.query.Query; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java similarity index 80% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoService.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java index 20b889e..657db7e 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java @@ -23,14 +23,14 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.func.basesupplierinfo.*; import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign; +import com.yxt.wms.feign.supplier.supplierinfo.SupplierInfoFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,18 +52,25 @@ import java.util.List; @Service public class SupplierInfoService extends MybatisBaseService { +// @Autowired +// private SysStaffOrgFeign sysStaffOrgFeign; +// @Autowired +// private SysOrganizationFeign sysOrganizationFeign; +// @Autowired +// private BaseSupplierBankService baseSupplierBankService; @Autowired - BaseSupplierInfoFeign baseSupplierInfoFeign; + SupplierInfoFeign baseSupplierInfoFeign; - public ResultBean> listPageVo(PagerQuery pq) { + public ResultBean> listPageVo(PagerQuery pq) { + SupplierInfoQuery query = pq.getParams(); return baseSupplierInfoFeign.listPage(pq); } - public ResultBean saveOrUpdateDto(BaseSupplierInfoDto dto){ + public ResultBean saveOrUpdateDto(SupplierInfoDto dto){ return baseSupplierInfoFeign.save(dto); } - public ResultBean fetchDetailsVoBySid(String sid){ + public ResultBean fetchDetailsVoBySid(String sid){ return baseSupplierInfoFeign.fetchDetailsBySid(sid); } @@ -76,7 +83,7 @@ public class SupplierInfoService extends MybatisBaseService> choiceSupplierInfo(String createOrgSid) { + public ResultBean> choiceSupplierInfo(String createOrgSid) { return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid); } } \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoVo.java similarity index 98% rename from wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoVo.java index fa7f3a7..ddb9321 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.aggregation.supplier; +package com.yxt.wms.biz.func.supplierinfo; import com.yxt.common.core.vo.Vo; diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierType.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierType.java new file mode 100644 index 0000000..c10d2bd --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierType.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.suppliertype; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierType.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierType
+ * Description: 供应商类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型", description = "供应商类型") +@TableName("base_supplier_type") +public class SupplierType extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeDetailsVo.java new file mode 100644 index 0000000..1c94888 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeDetailsVo.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.suppliertype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeVo.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
+ * Description: 供应商类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型 视图数据详情", description = "供应商类型 视图数据详情") +public class SupplierTypeDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeDto.java new file mode 100644 index 0000000..a95809c --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeDto.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.suppliertype; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeDto.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeDto
+ * Description: 供应商类型 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型 数据传输对象", description = "供应商类型 数据传输对象") +public class SupplierTypeDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + + @ApiModelProperty("组织全路径") + private String orgPath; +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeMapper.java new file mode 100644 index 0000000..7b621c6 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeMapper.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.suppliertype; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeMapper.java
+ * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeMapper
+ * Description: 供应商类型.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SupplierTypeMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_supplier_type") + List selectListVo(); + + @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid}") + int checkSaveCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid); + + @Select("SELECT COUNT(*) FROM base_supplier_type WHERE supplierTypeCode = #{supplierTypeCode} AND useOrgSid = #{useOrgSid} AND sid != #{dtoSid}") + int checkUpdateCode(@Param("supplierTypeCode") String supplierTypeCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid); +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeMapper.xml new file mode 100644 index 0000000..d3bdcff --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeQuery.java new file mode 100644 index 0000000..55204dc --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeQuery.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.suppliertype; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeQuery.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeQuery
+ * Description: 供应商类型 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商类型 查询条件", description = "供应商类型 查询条件") +public class SupplierTypeQuery implements Query { + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeService.java new file mode 100644 index 0000000..a588579 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeService.java @@ -0,0 +1,128 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.suppliertype; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.supplier.suppliertype.SupplierTypeFeign; +import com.yxt.wms.feign.warehouse.warehousearea.WarehouseAreaFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Arrays; +import java.util.List; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeService.java
+ * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeService
+ * Description: 供应商类型 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SupplierTypeService extends MybatisBaseService { + + @Autowired + SupplierTypeFeign supplierTypeFeign; + @Autowired + WarehouseAreaFeign warehouseAreaFeign; + @Autowired + SysOrganizationFeign sysOrganizationFeign; + @Autowired + SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + SysUserFeign sysUserFeign; + + public ResultBean> listPageVo(PagerQuery pq) { + + return supplierTypeFeign.listPage(pq); + } + + public ResultBean saveOrUpdateDto(SupplierTypeDto dto){ + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + String deptName = ""; + String deptSid = ""; + String createOrgSid = ""; + String orgPath = dto.getOrgPath(); + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); + deptName = sysOrganization1.getName(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptName = sysOrganization.getName(); + deptName = sysOrganization.getName(); + deptSid = sysOrganization.getSid(); + } + dto.setUseOrgSid(deptSid); + createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + //创建组织使用组织 + ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); + if (organizationResultBean.getData() != null) { + dto.setCreateOrgSid(createOrgSid); + dto.setCreateOrgName(organizationResultBean.getData().getName()); + } + } + int i = supplierTypeFeign.checkSaveCode(dto.getSupplierTypeCode(),dto.getUseOrgSid()).getData(); + if (i > 0){ + return rb.setMsg("新增编码已存在，请重新输入"); + } + return supplierTypeFeign.save(dto); + } + int i = supplierTypeFeign.checkUpdateCode(dto.getSupplierTypeCode(),dto.getUseOrgSid(),dtoSid).getData(); + if (i > 0){ + return rb.setMsg("修改编码已存在，请重新输入"); + } + return supplierTypeFeign.save(dto); + } + + public ResultBean fetchDetailsVoBySid(String sid){ + return supplierTypeFeign.fetchDetailsBySid(sid); + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeVo.java similarity index 67% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeVo.java index 516494c..08fc377 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeVo.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; +package com.yxt.wms.biz.func.suppliertype; import com.yxt.common.core.vo.Vo; @@ -32,34 +32,31 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
+ * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeVo.java
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo
+ * Description: 供应商类型 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
+ * Makedate: 2024-03-13 16:51:56
* * @author liupopo * @version 1.0 * @since 1.0 */ @Data -@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") -public class BaseSupplierInfoVo implements Vo { +@ApiModel(value = "供应商类型 视图数据对象", description = "供应商类型 视图数据对象") +public class SupplierTypeVo implements Vo { private String sid; // sid - @ApiModelProperty("供应商名称") - private String supplierName; - @ApiModelProperty("供应商类型") - private String supplierTypeName; - @ApiModelProperty("详细地址") - private String address; - @ApiModelProperty("电话") - private String contactTelePhone; - @ApiModelProperty("联系人") - private String contactName; - @ApiModelProperty("手机") - private String contactMobile; + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; // 供应商类型名称 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织名称") + private String createOrgName; // 创建组织名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaQuery.java index e0f5eed..540ec06 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaQuery.java @@ -16,6 +16,7 @@ public class WarehouseAreaQuery implements Query { private String code;//编码 private String warehouseSid;//仓库 private String areaTypeSid;//库区类型 + private String orgLevelKey;// @ApiModelProperty("菜单路由") private String menuUrl; @@ -23,6 +24,4 @@ public class WarehouseAreaQuery implements Query { private String orgPath; @ApiModelProperty("用户sid") private String userSid; - private QueryWrapper qw; - private IPage page; } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java index 7db74a2..b5bc739 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java @@ -38,60 +38,13 @@ public class WarehouseAreaService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); WarehouseAreaQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); privilegeQuery.setUserSid(query.getUserSid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("a.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - if (StringUtils.isNotBlank(query.getName())) { - qw.like("a.areaName", query.getName()); - } - if (StringUtils.isNotBlank(query.getCode())) { - qw.like("a.areaCode", query.getCode()); - } - if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.eq("b.sid", query.getWarehouseSid()); - } - if (StringUtils.isNotBlank(query.getAreaTypeSid())) { - qw.eq("c.sid", query.getAreaTypeSid()); - } - qw.ne("a.isDelete", "1"); - IPage page = PagerUtil.queryToPage(pq); - query.setPage(page); - query.setQw(qw); - IPage pagging = warehouseAreaFeign.listPage(query).getData(); + pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); + IPage pagging = warehouseAreaFeign.listPage(pq).getData(); PagerVo p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java index 795c4a7..fe51c71 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeQuery.java @@ -13,13 +13,11 @@ import lombok.Data; @Data public class WarehouseAreaTypeQuery implements Query { private String name; - + private String orgLevelKey;// @ApiModelProperty("菜单路由") private String menuUrl; @ApiModelProperty("组织全路径sid") private String orgPath; @ApiModelProperty("用户sid") private String userSid; - private IPage page; - private QueryWrapperqw; } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java index 1686e31..01b6325 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java @@ -42,51 +42,13 @@ public class WarehouseAreaTypeService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); WarehouseAreaTypeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); privilegeQuery.setUserSid(query.getUserSid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("a.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - if(StringUtils.isNotBlank(query.getName())){ - qw.like("a.warehouseAreaTypeName",query.getName()); - } - qw.ne("a.isDelete","1"); - IPage page = PagerUtil.queryToPage(pq); - query.setPage(page); - query.setQw(qw); - IPage pagging = warehouseAreaTypeFeign.listPage(query).getData(); + pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); + IPage pagging = warehouseAreaTypeFeign.listPage(pq).getData(); PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoQuery.java index cdc385d..f8a4db4 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoQuery.java @@ -16,6 +16,7 @@ public class WarehouseInfoQuery implements Query { private String name; private String code; private String address; + private String orgLevelKey;// @ApiModelProperty("菜单路由") private String menuUrl; @ApiModelProperty("组织全路径sid") @@ -23,7 +24,4 @@ public class WarehouseInfoQuery implements Query { @ApiModelProperty("用户sid") private String userSid; - private IPage page; - - private QueryWrapper qw; } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java index 3c225d8..b4249b6 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java @@ -40,58 +40,13 @@ public class WarehouseInfoService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); WarehouseInfoQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); privilegeQuery.setUserSid(query.getUserSid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("w.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - if (StringUtils.isNotBlank(query.getName())) { - qw.like("w.warehouseName", query.getName()); - } - if (StringUtils.isNotBlank(query.getCode())) { - qw.like("w.warehouseCode", query.getCode()); - } - if (StringUtils.isNotBlank(query.getAddress())) { - qw.like("w.address", query.getAddress()); - } - qw.ne("isDelete",1); - qw.orderByDesc("sortNo"); - IPage page = PagerUtil.queryToPage(pq); - query.setPage(page); - query.setQw(qw); - IPage pagging = WarehouseFeign.listPage(query).getData(); + pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); + IPage pagging = WarehouseFeign.listPage(pq).getData(); PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbill.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbill.java new file mode 100644 index 0000000..e0a9fe4 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbill.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbill; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbill.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbill
+ * Description: 库存盘点.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点", description = "库存盘点") +@TableName("wms_inventory_checkbill") +public class WarehouseInventoryCheckbill extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("盘点类型") + private String checkType; // 盘点类型 + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + private Integer checkState; // 盘点状态（盘点中1，盘点完成2） + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; // 盘盈数量 + @ApiModelProperty("盘盈金额") + private BigDecimal profitAmount; // 盘盈金额 + @ApiModelProperty("盘亏数量") + private BigDecimal lossCount; // 盘亏数量 + @ApiModelProperty("盈亏金额") + private BigDecimal lossAmount; // 盈亏金额 + @ApiModelProperty("使用组织sid") + private String useOrgSid; // 使用组织sid + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillDetailsVo.java new file mode 100644 index 0000000..2def060 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillDetailsVo.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbill; + + +import com.yxt.common.core.vo.Vo; +import com.yxt.wms.biz.func.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDetailsVo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-Warehouse(仓储)
+ * File: WarehouseInventoryCheckbillVo.java
+ * Class: com.yxt.Warehouse.api.Warehouseinventorycheckbill.WarehouseInventoryCheckbillVo
+ * Description: 库存盘点 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点 视图数据详情", description = "库存盘点 视图数据详情") +public class WarehouseInventoryCheckbillDetailsVo implements Vo { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("盘点类型") + private String checkType; + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + private Integer checkState; + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; + @ApiModelProperty("盘盈金额") + private BigDecimal profitAmount; + @ApiModelProperty("盘亏数量") + private BigDecimal lossCount; + @ApiModelProperty("盘亏金额") + private BigDecimal lossAmount; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("盘库明细") + private List WarehouseInventoryCheckbillDetailList; +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillDto.java new file mode 100644 index 0000000..b563661 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillDto.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbill; + + +import com.yxt.common.core.dto.Dto; +import com.yxt.wms.biz.func.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDto.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbillDto
+ * Description: 库存盘点 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点 数据传输对象", description = "库存盘点 数据传输对象") +public class WarehouseInventoryCheckbillDto implements Dto { + + private String sid; + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("盘点类型") + private String checkType; + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + private Integer checkState; + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; + @ApiModelProperty("盘盈金额") + private BigDecimal profitAmount; + @ApiModelProperty("盘亏数量") + private BigDecimal lossCount; + @ApiModelProperty("盘亏金额") + private BigDecimal lossAmount; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("盘库明细") + private List wmsInventoryCheckbillDetailList; +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillMapper.java new file mode 100644 index 0000000..f8a9615 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillMapper.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbill; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillMapper.java
+ * Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillMapper
+ * Description: 库存盘点.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface WarehouseInventoryCheckbillMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from warehouse_inventory_checkbill") + List selectListVo(); +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillMapper.xml new file mode 100644 index 0000000..16e5c9e --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillQuery.java similarity index 71% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillQuery.java index 4491bc3..f535eb8 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillQuery.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; +package com.yxt.wms.biz.func.warehouseinventorycheckbill; import com.yxt.common.core.query.Query; @@ -32,31 +32,26 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoQuery.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoQuery
- * Description: 供应商信息 查询条件.
+ * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillQuery.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbillQuery
+ * Description: 库存盘点 查询条件.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
+ * Makedate: 2024-03-22 09:25:01
* * @author liupopo * @version 1.0 * @since 1.0 */ @Data -@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件") -public class BaseSupplierInfoQuery implements Query { - - @ApiModelProperty("供应商名称") - private String supplierName; - @ApiModelProperty("供应商类型") - private String supplierTypeName; - @ApiModelProperty("电话") - private String contactTelePhone; - @ApiModelProperty("联系人") - private String contactName; +@ApiModel(value = "库存盘点 查询条件", description = "库存盘点 查询条件") +public class WarehouseInventoryCheckbillQuery implements Query { + @ApiModelProperty("创建开始日期") + private String createStartTime; + @ApiModelProperty("创建结束日期") + private String createEndTime; @ApiModelProperty("其他查询条件") private String otherQuery; } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillService.java new file mode 100644 index 0000000..c268f95 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillService.java @@ -0,0 +1,88 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbill; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.warehouse.warehouseinventorycheckbill.WarehouseInventoryCheckbillFeign; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillService.java
+ * Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillService
+ * Description: 库存盘点 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class WarehouseInventoryCheckbillService extends MybatisBaseService { + + @Autowired + private WarehouseInventoryCheckbillFeign warehouseInventoryCheckbillFeign; + + public PagerVo listPageVo(PagerQuery pq) { + + PagerVo pagging = warehouseInventoryCheckbillFeign.listPage(pq).getData(); + for (WarehouseInventoryCheckbillVo record : pagging.getRecords()) { + Integer checkState = record.getCheckState(); + if (checkState == 1){ + record.setCheckStateName("盘点中"); + }else if (checkState == 2){ + record.setCheckStateName("盘点完成"); + } + } + return pagging; + } + + public void saveOrUpdateDto(WarehouseInventoryCheckbillDto dto){ + warehouseInventoryCheckbillFeign.save(dto); + } + + + public ResultBean fetchDetailsVoBySid(String sid){ + return warehouseInventoryCheckbillFeign.fetchDetailsBySid(sid); + } + + public void inven(WarehouseInventoryCheckbillDto dto) { + warehouseInventoryCheckbillFeign.inven(dto); + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillVo.java new file mode 100644 index 0000000..6dd0c66 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillVo.java @@ -0,0 +1,81 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbill; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbillVo
+ * Description: 库存盘点 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点 视图数据对象", description = "库存盘点 视图数据对象") +public class WarehouseInventoryCheckbillVo implements Vo { + + private String sid; + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("制单日期") + private String createDate; + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + private Integer checkState; + @ApiModelProperty("盘点状态（盘点中1，盘点完成2）") + private String checkStateName; + @ApiModelProperty("完成时间") + private String completeDate; + @ApiModelProperty("盘盈数量") + private BigDecimal profitCount; + @ApiModelProperty("盘盈金额") + private BigDecimal profitAmount; + @ApiModelProperty("盘亏数量") + private BigDecimal lossCount; + @ApiModelProperty("盈亏金额") + private BigDecimal lossAmount; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("门店") + private String createOrgName; + @ApiModelProperty("id") + private String id; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java new file mode 100644 index 0000000..7eaa95b --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbilldetail; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetail.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetail
+ * Description: 库存盘点-明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细", description = "库存盘点-明细") +@TableName("wms_inventory_checkbill_detail") +public class WarehouseInventoryCheckbillDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("盘点单sid") + private String billSid; // 盘点单sid + @ApiModelProperty("商品库存sid") + private String inventorySid; // 商品库存sid + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("仓库") + private String warehouseName; // 仓库 + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; // 含税价 + @ApiModelProperty("账面数量") + private BigDecimal bookCount; // 账面数量 + @ApiModelProperty("实盘数量") + private BigDecimal realCount; // 实盘数量 + @ApiModelProperty("现场照片（多张中间用英文逗号分隔）") + private String picUrl; // 现场照片（多张中间用英文逗号分隔） + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java new file mode 100644 index 0000000..0194cc8 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbilldetail; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WarehouseInventoryCheckbillDetailDetailsVo implements Vo { + + private String sid; + + /* + * 数据库字段 + * */ + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("盘点状态（0正常、2盘亏、1盘盈）") + private String state; + @ApiModelProperty("盘点单sid") + private String billSid; + @ApiModelProperty("商品库存sid") + private String inventorySid; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + @ApiModelProperty("账面数量") + private BigDecimal bookCount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("现场照片") + private List picUrls = new ArrayList<>(); + + /* + * 页面展示字段 + * */ + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("零件号") + private String goodsSkuCode; + @ApiModelProperty("车型") + private String carModel; + @ApiModelProperty("商品单位") + private String unit; + + /* + * 盘点接口需要字段 + * */ + @ApiModelProperty("盈亏数") + private BigDecimal proAndLossCount; +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java new file mode 100644 index 0000000..638e7c8 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java @@ -0,0 +1,102 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbilldetail; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailDto.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto
+ * Description: 库存盘点-明细 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 数据传输对象", description = "库存盘点-明细 数据传输对象") +public class WarehouseInventoryCheckbillDetailDto implements Dto { + + private String sid; + + /* + * 数据库字段 + * */ + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("盘点状态（0正常、2盘亏、1盘盈）") + private String state; + @ApiModelProperty("盘点单sid") + private String billSid; + @ApiModelProperty("商品库存sid") + private String inventorySid; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + @ApiModelProperty("账面数量") + private BigDecimal bookCount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("现场照片") + private List picUrls = new ArrayList<>(); + + /* + * 页面展示字段 + * */ + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("零件号") + private String goodsSkuCode; + @ApiModelProperty("车型") + private String carModel; + @ApiModelProperty("商品单位") + private String unit; + + /* + * 盘点接口需要字段 + * */ + @ApiModelProperty("盈亏数") + private BigDecimal proAndLossCount; +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java new file mode 100644 index 0000000..ffc98ba --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java @@ -0,0 +1,66 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbilldetail; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailMapper.java
+ * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailMapper
+ * Description: 库存盘点-明细.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface WarehouseInventoryCheckbillDetailMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from warehouse_inventory_checkbill_detail") + List selectListVo(); + + @Delete("delete from warehouse_inventory_checkbill_detail where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); + + List selByMainSid(String billSid); +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml new file mode 100644 index 0000000..7b68c84 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java new file mode 100644 index 0000000..85ab6c9 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.wms.biz.func.warehouseinventorycheckbilldetail; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailQuery.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailQuery
+ * Description: 库存盘点-明细 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 查询条件", description = "库存盘点-明细 查询条件") +public class WarehouseInventoryCheckbillDetailQuery implements Query { + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java similarity index 59% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java index 8cdc74a..77995b5 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java @@ -23,7 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierBank; +package com.yxt.wms.biz.func.warehouseinventorycheckbilldetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -38,31 +38,31 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierBankService.java
- * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankService
- * Description: 供应商开户行信息 业务逻辑.
+ * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailService.java
+ * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService
+ * Description: 库存盘点-明细 业务逻辑.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
+ * Makedate: 2024-03-22 09:25:02
* * @author liupopo * @version 1.0 * @since 1.0 */ @Service -public class BaseSupplierBankService extends MybatisBaseService { +public class WarehouseInventoryCheckbillDetailService extends MybatisBaseService { - public PagerVo listPageVo(PagerQuery pq) { - BaseSupplierBankQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); + public PagerVo listPageVo(PagerQuery pq) { + WarehouseInventoryCheckbillDetailQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } - public void saveOrUpdateDto(BaseSupplierBankDto dto){ + public void saveOrUpdateDto(WarehouseInventoryCheckbillDetailDto dto){ String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); @@ -71,34 +71,34 @@ public class BaseSupplierBankService extends MybatisBaseService selectBySupplierSid(String supplierSid) { - return baseMapper.selectBySupplierSid(supplierSid); + public List selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); } } \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java similarity index 74% rename from wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java rename to wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java index 6ea8b82..388a53c 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java @@ -23,32 +23,28 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.wms.biz.func.basesupplierinfo; +package com.yxt.wms.biz.func.warehouseinventorycheckbilldetail; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * Project: yxt-base(供应商管理)
- * File: BaseSupplierInfoVo.java
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
- * Description: 供应商信息 视图数据对象.
+ * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
* Copyright: Copyright (c) 2011
* Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-18 13:33:13
+ * Makedate: 2024-03-22 09:25:02
* * @author liupopo * @version 1.0 * @since 1.0 */ @Data -@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") -public class BaseSupplierInfoChoice implements Vo { +@ApiModel(value = "库存盘点-明细 视图数据对象", description = "库存盘点-明细 视图数据对象") +public class WarehouseInventoryCheckbillDetailVo implements Vo { - private String sid; - @ApiModelProperty("供应商名称") - private String supplierName; } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java new file mode 100644 index 0000000..a1e2750 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java @@ -0,0 +1,45 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBill extends BaseEntity { + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("来源单号") + private String sourceBillNo; + @ApiModelProperty("制单人") + private String createByName; + @ApiModelProperty("业务类型key") + private String busTypeKey; + @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") + private String busTypeValue; + @ApiModelProperty("货主sid") + private String goodsOwnerSid; + @ApiModelProperty("货主") + private String goodsOwner; + @ApiModelProperty("已完成/已发货") + private Integer billState; + @ApiModelProperty("是否一起发货（否0，是1）") + private Integer isTogether; + @ApiModelProperty("挂起状态（1挂起，0不挂起，2解锁）") + private Integer isHandUp; + @ApiModelProperty("优先级") + private Integer priority; + @ApiModelProperty("实际发货时间") + private Date actualDeliveTime; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java new file mode 100644 index 0000000..80f78b0 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java @@ -0,0 +1,39 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBillDetailsVo { + + private String sid; + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("制单人") + private String createByName; + @ApiModelProperty("单据日期") + private String createTime; + @ApiModelProperty("外部单号") + private String sourceBillNo; + + @ApiModelProperty("业务类型key") + private String busTypeKey; + @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") + private String busTypeValue; + + @ApiModelProperty("单据状态") + private String billState; + @ApiModelProperty("备注") + private String remarks; + + private List detailsList = new ArrayList<>(); +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java new file mode 100644 index 0000000..b4e6b77 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java @@ -0,0 +1,42 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + + +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBillDto { + + private String sid; + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("制单人") + private String createByName; + @ApiModelProperty("单据日期") + private String createTime; + @ApiModelProperty("外部单号") + private String sourceBillNo; + + @ApiModelProperty("业务类型key") + private String busTypeKey; + @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") + private String busTypeValue; + + @ApiModelProperty("单据状态") + private String billState; + @ApiModelProperty("备注") + private String remarks; + + private List detailsList = new ArrayList<>(); + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryQuery.java new file mode 100644 index 0000000..3e5ad70 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryQuery.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/26 + **/ +@Data +public class WarehouseOutBillInventoryQuery implements Query { + + //商品名称 + @ApiModelProperty("商品名称") + private String goodsSpuName; + + //商品编码 + private String goodsSkuCode; + + //仓库 + private String warehouseName; + + //库位 + private String warehouseRackCode; + + //供应商 + private String supplierName; + + private String orgPath; + + private String busrepairBillsid;//维修工单sid + private String name; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java new file mode 100644 index 0000000..149e00f --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java @@ -0,0 +1,51 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/26 + **/ +@Data +public class WarehouseOutBillInventoryVo { + private String sid; + private String inventorySid; + @ApiModelProperty("商品ID") + private String goodsID; + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("图号") + private String goodsSkuCode; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + + private String price;//销售单价 + private String outboundCount;// 已出库数量 + //入库单价 + private String money; + //库存数量 + private String count; + //供应商 + private String supplierSid; + private String supplierName; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.java new file mode 100644 index 0000000..0fcebc3 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.java @@ -0,0 +1,22 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface WarehouseOutBillMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + WarehouseOutBillDetailsVo details(String sid); + + IPage getInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml new file mode 100644 index 0000000..b840e7d --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java new file mode 100644 index 0000000..669cf65 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java @@ -0,0 +1,31 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBillQuery implements Query { + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("单据日期开始时间") + private String createTimeStart; + @ApiModelProperty("单据日期结束时间") + private String createTimeEnd; + @ApiModelProperty("来源单号") + private String sourceBillNo; + @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") + private String busTypeValue; + @ApiModelProperty("单据状态") + private String billState; + @ApiModelProperty("组织sid全路径") + private String orgPath; + @ApiModelProperty("用户sid") + private String createBySid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java new file mode 100644 index 0000000..f7a061e --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java @@ -0,0 +1,60 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.warehouse.warehousesoutbill.WarehouseOutBillFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Service +public class WarehouseOutBillService extends MybatisBaseService { + + @Autowired + private WarehouseOutBillFeign warehouseOutBillFeign; + + + public ResultBean> listPage(PagerQuery pagerQuery) { + return warehouseOutBillFeign.pageList(pagerQuery); + } + + public ResultBean saveOrUpdateOutBill(WarehouseOutBillDto dto) { + return warehouseOutBillFeign.saveOrUpdateOutBill(dto); + } + + public ResultBean details(String sid) { + return warehouseOutBillFeign.details(sid); + } + + public ResultBean> getInventoryList(PagerQuery pagerQuery) { + WarehouseOutBillInventoryQuery query = pagerQuery.getParams(); + PagerVo pagerVo=warehouseOutBillFeign.getInventoryList(pagerQuery).getData(); +// if (StringUtils.isNotBlank(query.getBusrepairBillsid())) { +// List records = pagerVo.getRecords(); +// for (WarehouseOutBillInventoryVo record : records) { +// //维修出入库查询已出库数量 +// String billSid = query.getBusrepairBillsid(); +// String chuKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "0", record.getGoodsID()).getData(); +// String ruKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "1", record.getGoodsID()).getData(); +// BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount)); +// if (null != count) { +// record.setOutboundCount(count.toString()); +// } else { +// record.setOutboundCount("0"); +// } +// } +// } + return new ResultBean>().success().setData(pagerVo); + } + + public ResultBean confirm(WarehouseOutBillDto dto) { + return warehouseOutBillFeign.confirm(dto); + } + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java new file mode 100644 index 0000000..aff0105 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBillVo { + + private String sid; + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("单据日期") + private String createTime; + @ApiModelProperty("制单人") + private String createByName; + @ApiModelProperty("来源单号") + private String sourceBillNo; + @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") + private String busTypeValue; + @ApiModelProperty("单据状态：已完成/已发货") + private String billState; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java new file mode 100644 index 0000000..7c87385 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java @@ -0,0 +1,49 @@ +package com.yxt.wms.biz.func.warehouseoutbilldetail; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBillDetail extends BaseEntity { + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品sku编码") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("订单数量") + private BigDecimal orderCount; + @ApiModelProperty("未结数量") + private BigDecimal remainingCount; + @ApiModelProperty("调整数量") + private BigDecimal adjustCount; + @ApiModelProperty("分配数量") + private BigDecimal distributeCount; + @ApiModelProperty("发货数量") + private BigDecimal deliveryCount; + @ApiModelProperty("状态（新建/已发货完成、部分分配、全部分配等）") + private Integer billState; + @ApiModelProperty("发货时间") + private Date deliveTime; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java new file mode 100644 index 0000000..0ec95dd --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java @@ -0,0 +1,50 @@ +package com.yxt.wms.biz.func.warehouseoutbilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutBillDetailDto { + + private String sid; + @ApiModelProperty("库存商品sid") + private String inventorySid; + + @ApiModelProperty("商品基础信息Sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品sku编码") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + + + @ApiModelProperty("出库数量") + private String outCount; + @ApiModelProperty("仓库sid") + private String warehouseSid; + //仓库名称 + private String warehouseName; + //库位sid + private String warehouseRackSid; + //库位编码 + private String warehouseRackCode; + //销售单价 + private String money; + //金额 + private String moneyAll; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java new file mode 100644 index 0000000..b848897 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java @@ -0,0 +1,18 @@ +package com.yxt.wms.biz.func.warehouseoutbilldetail; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/29 + **/ +@Mapper +public interface WarehouseOutBillDetailMapper extends BaseMapper { + int deleteByMainSid(String sid); + + List selectDetailsList(String sid); +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml new file mode 100644 index 0000000..7890b6f --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml @@ -0,0 +1,21 @@ + + + + + delete + from wms_out_bill_detail + where billSid = #{sid} + + + + \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java new file mode 100644 index 0000000..3efe23b --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java @@ -0,0 +1,31 @@ +package com.yxt.wms.biz.func.warehouseoutbilldetail; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/29 + **/ +@Service +public class WarehouseOutBillDetailService extends MybatisBaseService { + public void saveOrUpdateBillDetails(String sid, List detailsList) { + //删除 + baseMapper.deleteByMainSid(sid); + for (int i = 0; i < detailsList.size(); i++) { + WarehouseOutBillDetailDto wmsOutBillDetailDto = detailsList.get(i); + WarehouseOutBillDetail wmsOutBillDetail = new WarehouseOutBillDetail(); + BeanUtil.copyProperties(wmsOutBillDetailDto, wmsOutBillDetail, "sid"); + wmsOutBillDetail.setBillSid(sid); + baseMapper.insert(wmsOutBillDetail); + } + } + + public List selectDetailsList(String sid) { + return baseMapper.selectDetailsList(sid); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackQuery.java index 180d844..44a678c 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackQuery.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackQuery.java @@ -22,6 +22,5 @@ public class WarehouseRackQuery implements Query { private String orgPath; @ApiModelProperty("用户sid") private String userSid; - private IPage page; - private QueryWrapperqw; + private String orgLevelKey;// } diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java index 30aa720..61446c8 100644 --- a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java @@ -39,60 +39,14 @@ public class WarehouseRackService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); WarehouseRackQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); PrivilegeQuery privilegeQuery = new PrivilegeQuery(); privilegeQuery.setOrgPath(query.getOrgPath()); privilegeQuery.setMenuUrl(query.getMenuUrl()); privilegeQuery.setUserSid(query.getUserSid()); ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("a.createBySid", query.getUserSid()); - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - } else { - PagerVo p = new PagerVo<>(); - return rb.success().setData(p); - } - if (StringUtils.isNotBlank(query.getName())) { - qw.like("rackName", query.getName()); - } - if (StringUtils.isNotBlank(query.getCode())) { - qw.like("rackCode", query.getCode()); - } - if (StringUtils.isNotBlank(query.getAreaTypeSid())) { - qw.eq("b.sid", query.getAreaTypeSid()); - } - if (StringUtils.isNotBlank(query.getWarehouseSid())) { - qw.eq("c.sid", query.getWarehouseSid()); - } - qw.ne("a.isDelete", "1"); - IPage page = PagerUtil.queryToPage(pq); - query.setPage(page); - query.setQw(qw); - IPage pagging = warehouseRackFeign.listPage(query).getData(); + pq.getParams().setOrgLevelKey(defaultIdReltBean.getData()); + + IPage pagging = warehouseRackFeign.listPage(pq).getData(); PagerVo p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseGoodsInventoryVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseGoodsInventoryVo.java new file mode 100644 index 0000000..8703347 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseGoodsInventoryVo.java @@ -0,0 +1,19 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/25 16:54 + */ +@Data +public class WarehouseGoodsInventoryVo implements Vo { + + private String goodsSkuOwnSpec;//型号 + private String warehouseSid;//仓库sid + private String warehouseName;//仓库名称 + private String warehouseRackName; //货位 + private String count;//库存数量 +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventory.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventory.java new file mode 100644 index 0000000..b879850 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventory.java @@ -0,0 +1,62 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/28 8:38 + */ +@Data +@TableName("wms_inventory") +public class WarehouseInventory extends BaseEntity { + + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") + private String goodsID; + @ApiModelProperty("商品基础信息sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码（图号）") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("现有量") + private BigDecimal count; + @ApiModelProperty("分配量（锁定数量，出库申请通过，但未实际出库）") + private BigDecimal allocateCount; + @ApiModelProperty("拣货量") + private BigDecimal pickCount; + @ApiModelProperty("冻结量") + private BigDecimal freezeCount; + @ApiModelProperty("入库单价") + private BigDecimal cost; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("首次入库日期-计算库龄的依据") + private Date firstInDate; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeExportVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeExportVo.java new file mode 100644 index 0000000..fab4d0a --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeExportVo.java @@ -0,0 +1,37 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.utils.ExportEntityMap; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/4/1 14:04 + */ +@Data +public class WarehouseInventoryAgeExportVo { + + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; + @ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName") + private String goodsSpuName;//商品名称 + @ExportEntityMap(CnName = "商品Sku名称", EnName = "goodsSkuTitle") + private String goodsSkuTitle;//商品Sku名称 + @ExportEntityMap(CnName = "零件号", EnName = "goodsSkuCode") + private String goodsSkuCode;//零件号 + @ExportEntityMap(CnName = "规格型号", EnName = "goodsSkuOwnSpec") + private String goodsSkuOwnSpec; //规格型号 + @ExportEntityMap(CnName = "计量单位", EnName = "unit") + private String unit;//计量单位 + @ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName") + private String warehouseName;//仓库名称 + @ExportEntityMap(CnName = "库位编码", EnName = "warehouseRackCode") + private String warehouseRackCode;//库位编码 + @ExportEntityMap(CnName = "库存数量", EnName = "count") + private String count;//库存数量 + @ExportEntityMap(CnName = "库龄", EnName = "age") + private String age;//库龄 + @ExportEntityMap(CnName = "入库日期", EnName = "firstInDate") + private String firstInDate; + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeQuery.java new file mode 100644 index 0000000..f6f70d8 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeQuery.java @@ -0,0 +1,26 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/25 16:54 + */ +@Data +public class WarehouseInventoryAgeQuery implements Query { + private String startDate; + private String endDate; + private String warehouseName;//仓库名称 +// @ApiModelProperty("商品类别名称") +// private String goodsTypeName; +// private String busTypeValue;//业务类型value（采购入库、维修出入库、销售出入库等） + private String goodsSpuName;//商品名称 + private String goodsSkuCode;//零件号 + private String ageStart;//库龄开始 + private String ageEnd;//库龄开始 + // private String queryName; //单号，来源单号，供应商 + private String orgPath; + private String useOrgSid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeVo.java new file mode 100644 index 0000000..39c1e4a --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAgeVo.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/25 16:54 + */ +@Data +public class WarehouseInventoryAgeVo implements Vo { + + private String sid; + private String goodsSpuName;//商品名称 + private String goodsSkuTitle;//商品Sku名称 + private String goodsSkuCode;//零件号 + private String goodsSkuOwnSpec; //规格型号 + private String unit;//计量单位 + private String warehouseName;//仓库名称 +// private String warehouseArea;//库区名称 + private String warehouseRackCode;//库位编码 + private String count;//库存数量 + private String age;//库龄 + //来源单号 + @ApiModelProperty("首次入库日期-计算库龄的依据") + private String firstInDate; + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectList.java new file mode 100644 index 0000000..a3749d5 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectList.java @@ -0,0 +1,39 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryAlloSelectList { + + //sid + private String sid; + //商品名称 + private String goodsSpuName; + //零件号 + private String goodsSkuCode; + //规格 + private String goodsSkuOwnSpec; + //车型 + private String carModel; + //商品单位 + private String unit; + //仓库sid + private String warehouseSid; + //仓库名称 + private String warehouseName; + //库位sid + private String warehouseRackSid; + //库位编码 + private String warehouseRackCode; + //库位名称 + private String areaName; + //含税价 + private String taxPrice; + //库存数量 + private String count; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectQuery.java new file mode 100644 index 0000000..8defb34 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryAlloSelectQuery.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryAlloSelectQuery implements Query { + + //组织sid + private String orgSid; + //商品名称 + private String goodsName; + //商品类别sid + private String goodsTypeSid; + //商品拼音 + private String goodsPY; + //品牌sid + private String brandSid; + //零件号 + private String goodsSkuCode; + //规格 + private String title; + //其他查询条件 + private String otherQuery; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListQuery.java new file mode 100644 index 0000000..380af19 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListQuery.java @@ -0,0 +1,21 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/19 + **/ +@Data +public class WarehouseInventoryBillListQuery implements Query { + //创建时间开始 + private String createTimeStart; + //创建时间结束 + private String createTimeEnd; + //业务类型 + private String busTypeKey; + + private String sid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListVo.java new file mode 100644 index 0000000..0db7a74 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryBillListVo.java @@ -0,0 +1,53 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/19 + **/ +@Data +public class WarehouseInventoryBillListVo { + + //商品名称 + private String goodsSpuName; + //商品标题 + private String goodsSkuTitle; + //商品编码 + private String goodsSkuCode; + //规格型号 + private String goodsSkuOwnSpec; + //计量单位 + private String unit; + //仓库名称 + private String warehouseName; + + //库区名称 + private String warehouseArea; + //货架名称 + private String warehouseRackName; + //业务类型 + private String busTypeValue; + //单位成本 + private String cost; + //销售价1 + private String price1; + //销售价2: + private String price2; + //科目 + private String subject; + //制单人 + private String createByName; + //创建时间 + private String createTime; + + //单号 + private String billNo; + //来源单号 + private String sourceBillNo; + //供应商 + private String billObjName; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryDto.java new file mode 100644 index 0000000..17b6f06 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryDto.java @@ -0,0 +1,48 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.Date; + +/** + * @author wangpengfei + * @date 2024/2/26 13:38 + */ +@Data +public class WarehouseInventoryDto implements Dto { + private String id; + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String isEnable; + private String goodsID;//商品ID（唯一编码，入库时生成） + private String goodsSid;//商品sid + private String billSid;//入库单sid + private String billDetailSid;//入库单明细sid + private String price1;//销售价格1 + private String price2;//销售价格2 + private String price3;//销售价格3 + private String price4;//销售价格4 + private String price5;//销售价格5 + private String unit;//计量单位 + private String count;//库存数量 + private String minimumPrice;//销售底价 + private String freePrice;//三包价格 + private String firstMaintainPrice;//首保价格 + private String warehouseSid;//仓库sid + private String warehouseName;//仓库名称 + private String warehouseArea;//货位 + private String isShowDiscount;//是否显示折扣标志 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date firstInDate;//首次入库日期-计算库龄的依据 + private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库 + private String sortNo;//排序 + private String useOrgSid;//使用组织sid + private String createOrgSid;//创建组织sid + + private String goodSpuSid; + private String goodsSkuSid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectList.java new file mode 100644 index 0000000..b8583fe --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectList.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryHandleSelectList { + + //商品ID + private String goodsID; + //商品名称 + private String goodsSpuName; + //图号 + private String goodsSkuCode; + //供应商 + private String supplierName; + //规格 + private String goodsSkuOwnSpec; + //商品单位 + private String unit; + //仓库sid + private String warehouseSid; + //仓库名称 + private String warehouseName; + //库位sid + private String warehouseRackSid; + //库位编码 + private String warehouseRackCode; + //库存数量 + private String count; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectQuery.java new file mode 100644 index 0000000..9142321 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryHandleSelectQuery.java @@ -0,0 +1,26 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryHandleSelectQuery implements Query { + + //组织sid + private String orgSid; + //商品名称 + private String goodsName; + //图号 + private String goodsSkuCode; + //仓库 + private String warehouseName; + //库位编码 + private String warehouseRackCode; + //供应商 + private String supplierName; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInitVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInitVo.java new file mode 100644 index 0000000..0b93aca --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInitVo.java @@ -0,0 +1,49 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/18 + **/ +@Data +public class WarehouseInventoryInitVo { + + private String sid; + + //仓库 + private String warehouseName; + //供应商 + private String billObjName; + //最近采购时间 + //最近销售时间 + //数量 + private String count; + //进价 + //税额 + //含税价 + //销售价格1 + private String price1; + //销售价格2 + private String price2; + //销售价格3 + private String price3; + //销售价格4 + private String price4; + //销售价格5 + private String price5; + //销售底价 + private String minimumPrice; + //货位 + private String warehouseArea; + //折扣标志 + private int isShowDiscount; + //三包价格 + private String freePrice; + //首保价格 + private String firstMaintainPrice; + //排序 + private int sortNo; + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectList.java new file mode 100644 index 0000000..cf46599 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectList.java @@ -0,0 +1,37 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryInvenSelectList { + + //sid + private String sid; + //商品名称 + private String goodsSpuName; + //商品编码 + private String goodsSkuCode; + //型号 + private String goodsSkuOwnSpec; + //商品单位 + private String unit; + //仓库sid + private String warehouseSid; + //仓库名称 + private String warehouseName; + //库位sid + private String warehouseRackSid; + //库位编码 + private String warehouseRackCode; + //库位名称 + private String areaName; + //账面数量 + private String count; + //销售单价 + private String salesPrice; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectQuery.java new file mode 100644 index 0000000..83baf75 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryInvenSelectQuery.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryInvenSelectQuery implements Query { + + //组织sid + private String orgSid; + //商品名称 + private String goodsName; + //商品类别sid + private String goodsTypeSid; + //商品拼音 + private String goodsPY; + //品牌sid + private String brandSid; + //零件号 + private String goodsSkuCode; + //规格 + private String title; + //其他查询条件 + private String otherQuery; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.java new file mode 100644 index 0000000..9c5404d --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.java @@ -0,0 +1,53 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Mapper +public interface WarehouseInventoryMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + WarehouseInventoryVo initialization(@Param("sid") String sid); + + int updatePrice1(@Param("price") String price, @Param("list") List stringList); + + int updatePrice2(@Param("price") String price, @Param("list") List stringList); + + int updatePrice3(@Param("price") String price, @Param("list") List stringList); + + int updatePrice4(@Param("price") String price, @Param("list") List stringList); + + int updatePrice5(@Param("price") String price, @Param("list") List stringList); + + IPage getBillList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("sid") String sid); + + List listExcel(@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage listPageSales(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage getPackageGoodsVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage inventoryAgeList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List ageExportExcel(@Param(Constants.WRAPPER) QueryWrapper qw); + + WarehouseGoodsInventoryVo selectInvenBySkuSid(String skuSid); + + IPage invenGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage alloGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage returnGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage handleGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml new file mode 100644 index 0000000..c8fac9c --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml @@ -0,0 +1,291 @@ + + + + + + + + + + + update wms_inventory + set price1 = #{price} where sid in + + #{item} + + + + + update wms_inventory + set price2 = #{price} where sid in + + #{item} + + + + + update wms_inventory + set price3 = #{price} where sid in + + #{item} + + + + + update wms_inventory + set price4 = #{price} where sid in + + #{item} + + + + + update wms_inventory + set price5 = #{price} where sid in + + #{item} + + + + + + + + + + + + + + + + + + + + + diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageQuery.java new file mode 100644 index 0000000..bea29e1 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageQuery.java @@ -0,0 +1,29 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/12 15:33 + */ +@Data +public class WarehouseInventoryPackageQuery implements Query { + private String orgPath; + @ApiModelProperty("商品名称") + private String goodsName; // 商品名称 + @ApiModelProperty("零件号") + private String goodsCode; // 商品编码（图号） + @ApiModelProperty("库存") + private String kuCun; + @ApiModelProperty("仓库名称") + private String warehouse; // 仓库名称 + @ApiModelProperty("货位") + private String warehouseArea; + @ApiModelProperty("商品分类") + private String goodsTypeName; + private String name; + private String useOrgSid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageVo.java new file mode 100644 index 0000000..25ba73f --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryPackageVo.java @@ -0,0 +1,44 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/12 10:00 + */ +@Data +public class WarehouseInventoryPackageVo { + + @ApiModelProperty("商品sid") + private String goodsSid; // 商品sid + @ApiModelProperty("商品名称") + private String goodsName; // 商品名称 + @ApiModelProperty("商品编码（图号）") + private String goodsCode; // 商品编码（图号） + @ApiModelProperty("车型sid") + private String goodsModelSid; // 车型sid + @ApiModelProperty("车型") + private String goodsModel; // 车型 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("规格") + private String specification; // 规格 + @ApiModelProperty("数量") + private String count; // 数量 + @ApiModelProperty("销售价") + private String price; // 销售价 + @ApiModelProperty("仓库名称") + private String warehouse; // 仓库名称 + @ApiModelProperty("仓库sid") + private String warehouseSid; // 仓库sid + @ApiModelProperty("货位") + private String warehouseArea; + @ApiModelProperty("备注") + private String remarks; // 备注 + @ApiModelProperty("三包价") + private String freePrice; // 三包价 + @ApiModelProperty("商品分类") + private String goodsTypeName; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryQuery.java new file mode 100644 index 0000000..9819943 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryQuery.java @@ -0,0 +1,32 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInventoryQuery implements Query { + @ApiModelProperty("goodsID") + private String goodsID; + + @ApiModelProperty("商品名称") + private String goodsSpuName; + + @ApiModelProperty("商品编码") + private String goodsSkuCode; + + @ApiModelProperty("仓库") + private String warehouseName; + + @ApiModelProperty("库位编码") + private String warehouseRackCode; + + @ApiModelProperty("批次号") + private String batchNumber; + + //供应商 +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectList.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectList.java new file mode 100644 index 0000000..56582d3 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectList.java @@ -0,0 +1,21 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryReturnSelectList { + + //商品名称 + private String goodsName; + //零件号 + private String goodsSkuCode; + //规格 + private String goodsSkuOwnSpec; + //单位 + private String unit; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectQuery.java new file mode 100644 index 0000000..3503b23 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryReturnSelectQuery.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/21 + **/ +@Data +public class WarehouseInventoryReturnSelectQuery implements Query { + + //组织sid + private String orgSid; + //商品名称 + private String goodsName; + //商品类别sid + private String goodsTypeSid; + //商品拼音 + private String goodsPY; + //品牌sid + private String brandSid; + //零件号 + private String goodsSkuCode; + //规格 + private String title; + //其他查询条件 + private String otherQuery; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesQuery.java new file mode 100644 index 0000000..c9027aa --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesQuery.java @@ -0,0 +1,16 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/20 15:14 + */ +@Data +public class WarehouseInventorySalesQuery implements Query { + + private String queryName; //名称 + private String useOrgSid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesVo.java new file mode 100644 index 0000000..3a1d1de --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySalesVo.java @@ -0,0 +1,29 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/3/20 15:14 + */ +@Data +public class WarehouseInventorySalesVo implements Vo { + + private String inventorySid; + private String goodsID; + private String goodSpuSid;//商品基础信息sid + private String goodsSpuName;//商品名称 + private String goodsSkuSid;//商品Skusid + private String goodsSkuTitle;//商品Sku名称 + private String goodsSkuCode;//商品编码（图号） + private String unit;//计量单位 + private String currentCount;//库存数量 + private String warehouseSid;//仓库sid + private String warehouse;//仓库名称 + private String price;//销售价 + +} + + diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySaveDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySaveDto.java new file mode 100644 index 0000000..7a10147 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventorySaveDto.java @@ -0,0 +1,57 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/19 + **/ +@Data +public class WarehouseInventorySaveDto { + + private String sid; + @ApiModelProperty("创建者sid") + private String createBySid; + @ApiModelProperty("批次号（入库日期+生产日期，如240320-240109）") + private String batchNumber; + @ApiModelProperty("商品ID（唯一编码，入库时生成，生成规则为商品编码+YYMMdd+4位流水）") + private String goodsID; + @ApiModelProperty("商品基础信息sid") + private String goodSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("现有量") + private String count; + @ApiModelProperty("分配量") + private String allocateCount; + @ApiModelProperty("拣货量") + private String pickCount; + @ApiModelProperty("冻结量") + private String freezeCount; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位sid") + private String warehouseRackSid; + @ApiModelProperty("库位编码") + private String warehouseRackCode; + @ApiModelProperty("首次入库日期") + private String firstInDate; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryService.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryService.java new file mode 100644 index 0000000..a4e160f --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryService.java @@ -0,0 +1,330 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.sysorganization.SysOrganizationVo; +import com.yxt.wms.biz.func.warehousesinventory.*; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo; +import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.wms.feign.warehouse.warehousesinventory.WarehouseInventoryFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/2/26 13:40 + */ +@Service +public class WarehouseInventoryService extends MybatisBaseService { + + @Resource + WarehouseInventoryFeign warehouseInventoryFeign; + @Resource + private BaseGoodsSkuFeign baseGoodsSkuFeign; + @Resource + private SysStaffOrgFeign sysStaffOrgFeign; + @Resource + private SysOrganizationFeign sysOrganizationFeign; + public ResultBean> listPage(PagerQuery pq) { + return warehouseInventoryFeign.listPage(pq); + } + + /** + * 入库 + * + * @param dto + * @return + */ + public ResultBean warehousing(WarehouseInventoryDto dto) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInventory WarehouseInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); + if (null == WarehouseInventory) { + WarehouseInventory Warehouse = new WarehouseInventory(); + BeanUtil.copyProperties(dto, Warehouse, "sid", "id"); + Warehouse.setFirstInDate(new Date()); + baseMapper.insert(Warehouse); + return rb.success().setData(Warehouse); + } else { + WarehouseInventory.setCount(new BigDecimal(Double.valueOf(dto.getCount()) + Double.valueOf(WarehouseInventory.getCount().toString()))); + baseMapper.updateById(WarehouseInventory); + } + return rb.success().setData(WarehouseInventory); + } + + /** + * 出库 + * + * @param dto + * @return + */ + public ResultBean outWarehousing(WarehouseInventoryDto dto) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInventory WarehouseInventory = baseMapper.selectOne(new QueryWrapper().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid())); + double exisInventory = Double.valueOf(WarehouseInventory.getCount().toString()); + double out = Double.valueOf(dto.getCount()); + if (null == WarehouseInventory) { + return rb.setMsg("此仓库没有相应的商品库存"); + } + if (exisInventory < -out) { + return rb.setMsg("库存不足"); + } + WarehouseInventory.setCount(new BigDecimal(exisInventory + out)); + baseMapper.updateById(WarehouseInventory); + return rb.success().setData(WarehouseInventory); + } + + public ResultBean saveOrUpdate(WarehouseInventoryDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = ""; + if (StringUtils.isNotBlank(dto.getSid())) { + sid = dto.getSid(); + WarehouseInventory WarehouseWarehouseRack = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto, WarehouseWarehouseRack, "id", "sid"); + baseMapper.updateById(WarehouseWarehouseRack); + } else { + WarehouseInventory WarehouseWarehouseRack = new WarehouseInventory(); + sid = WarehouseWarehouseRack.getSid(); + BeanUtil.copyProperties(dto, WarehouseWarehouseRack, "id", "sid"); + WarehouseWarehouseRack.setCreateTime(new DateTime()); + baseMapper.insert(WarehouseWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public ResultBean initialization(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInventoryVo vo = baseMapper.initialization(sid); + return rb.success().setData(vo); + } + + + public ResultBean delete(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInventory WarehouseWarehouseRack = fetchBySid(sid); + if (null != WarehouseWarehouseRack) { + baseMapper.deleteById(WarehouseWarehouseRack.getId()); + } + return rb.success(); + } + + public ResultBean updateIsEnable(String sid, String isEnable) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInventory WarehouseWarehouseRack = fetchBySid(sid); + if (null != WarehouseWarehouseRack) { + WarehouseWarehouseRack.setIsEnable(Integer.parseInt(isEnable)); + baseMapper.updateById(WarehouseWarehouseRack); + } + return rb.success().setMsg("成功"); + } + + public ResultBean updateWarehouseInventory(WarehouseInventoryUpdateDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + WarehouseInventory WarehouseInventory = fetchBySid(sid); + if (WarehouseInventory == null) { + return rb.setMsg("该库存信息不存在"); + } + BeanUtil.copyProperties(dto, WarehouseInventory, "sid"); + baseMapper.updateById(WarehouseInventory); + return rb.success(); + } + + public ResultBean delAllBySids(String[] sids) { + return warehouseInventoryFeign.delBySids(sids); + } + + /* public ResultBean init(String sid) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInventory WarehouseInventory = fetchBySid(sid); + if (WarehouseInventory == null) { + return rb.setData(new WarehouseInventoryInitVo()).setMsg("该库存信息不存在"); + } + WarehouseInventoryInitVo WarehouseInventoryInitVo = new WarehouseInventoryInitVo(); + BeanUtil.copyProperties(WarehouseInventory, WarehouseInventoryInitVo); + WarehouseInventoryBill WarehouseInventoryBill = WarehouseInventoryBillService.fetchBySid(WarehouseInventory.getBillSid()); + if (WarehouseInventoryBill != null) { + WarehouseInventoryInitVo.setBillObjName(WarehouseInventoryBill.getBillObjName()); + } + return rb.success().setData(WarehouseInventoryInitVo); + }*/ + + /* public ResultBean updatePrice(WarehouseInventoryUpdatePrice WarehouseInventoryUpdatePrice) { + ResultBean rb = ResultBean.fireFail(); + List stringList = WarehouseInventoryUpdatePrice.getSidsList(); + stringList.removeAll(Collections.singleton(null)); + String price = WarehouseInventoryUpdatePrice.getPrice(); + if (!stringList.isEmpty()) { + int type = WarehouseInventoryUpdatePrice.getType(); + switch (type) { + case 1: + baseMapper.updatePrice1(price, stringList); + break; + case 2: + baseMapper.updatePrice2(price, stringList); + break; + case 3: + baseMapper.updatePrice3(price, stringList); + break; + case 4: + baseMapper.updatePrice4(price, stringList); + break; + case 5: + baseMapper.updatePrice5(price, stringList); + break; + default: + break; + } + } + return rb.success(); + } + */ + /* public PagerVo getBillList(PagerQuery pagerQuery) { + WarehouseInventoryBillListQuery query = pagerQuery.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (query != null) { + qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (b.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (b.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')" + ); + if (StringUtils.isNotBlank(query.getBusTypeKey())) { + qw.eq("b.busTypeKey", query.getBusTypeKey()); + } + } + + IPage page = PagerUtil.queryToPage(pagerQuery); + IPage pagging = baseMapper.getBillList(page, qw, query.getSid()); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +*/ + public void listExcel(WarehouseInventoryQuery query) { + warehouseInventoryFeign.exportExcel(query); + } + + public ResultBean updateInventoryCount(WarehouseUpdateCountQuery query) { + return warehouseInventoryFeign.updateInventoryCount(query); + } + + public ResultBean> listPageSales(PagerQuery pq) { + return warehouseInventoryFeign.listPageSales(pq); + } + + public ResultBean> getPackageGoodsVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + WarehouseInventoryPackageQuery query = pq.getParams(); + String orgPath = query.getOrgPath(); + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + pq.getParams().setUseOrgSid(useOrgSid); + } + PagerVo pagging = warehouseInventoryFeign.getPackageGoodsVo(pq).getData(); + List records = pagging.getRecords(); + records.removeAll(Collections.singleton(null)); + if (!records.isEmpty()) { + for (WarehouseInventoryPackageVo record : records) { + BaseGoodsSkuDetailsVo skuDetailsVo = baseGoodsSkuFeign.getDetails(record.getGoodsSid()).getData(); + if (null != skuDetailsVo) { + if (StringUtils.isNotBlank(skuDetailsVo.getGoodsTypeName())) { + record.setGoodsTypeName(skuDetailsVo.getGoodsTypeName()); + } + } + } + } + return rb.success().setData(pagging); + } + + public ResultBean> inventoryAgeList(PagerQuery pq) { + WarehouseInventoryAgeQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getOrgPath())) { + String orgPath = query.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + pq.getParams().setUseOrgSid(useOrgSid); + } + } + return warehouseInventoryFeign.inventoryAgeList(pq); + } + + public void ageExportExcel(WarehouseInventoryAgeQuery query) { + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getOrgPath())) { + String orgPath = query.getOrgPath(); + ResultBean orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath); + if (orgSidByPath.getSuccess()) { + String useOrgSid = orgSidByPath.getData(); + query.setUseOrgSid(useOrgSid); + } + } + warehouseInventoryFeign.ageExportExcel(query); + } + + public ResultBean selectInvenBySkuSid(String skuSid) { + return warehouseInventoryFeign.selectInvenBySkuSid(skuSid); + } + + public ResultBean> invenGoodsListPage(PagerQuery pq) { + return warehouseInventoryFeign.invenGoodsListPage(pq); + } + + public ResultBean> alloGoodsListPage(PagerQuery pq) { + return warehouseInventoryFeign.alloGoodsListPage(pq); + } + + public ResultBean fetchEntityBySid(String sid) { + return warehouseInventoryFeign.fetchEntityBySid(sid); + } + + public ResultBean saveWarehouseInventory(WarehouseInventorySaveDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if (StringUtils.isBlank(sid)) { + WarehouseInventory WarehouseInventory = new WarehouseInventory(); + BeanUtil.copyProperties(dto, WarehouseInventory, "sid"); + sid = WarehouseInventory.getSid(); + baseMapper.insert(WarehouseInventory); + } else { + WarehouseInventory WarehouseInventory = fetchBySid(sid); + if (WarehouseInventory == null) { + return rb.setMsg("该商品库存不存在"); + } + BeanUtil.copyProperties(dto, WarehouseInventory, "sid"); + baseMapper.updateById(WarehouseInventory); + } + return rb.success().setData(sid); + } + + public ResultBean> returnGoodsListPage(PagerQuery pq) { + return warehouseInventoryFeign.returnGoodsListPage(pq); + } + + public ResultBean> handleGoodsListPage(PagerQuery pq) { + return warehouseInventoryFeign.handleGoodsListPage(pq); + } +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdateDto.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdateDto.java new file mode 100644 index 0000000..c0f9913 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdateDto.java @@ -0,0 +1,29 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/18 + **/ +@Data +public class WarehouseInventoryUpdateDto { + private String sid; + private String price1;//销售价格1 + private String price2;//销售价格2 + private String price3;//销售价格3 + private String price4;//销售价格4 + private String price5;//销售价格5 + + private String minimumPrice;//销售底价 + private String warehouseAreaSid;//库区sid + private String warehouseArea;//库区名称 + + private int isShowDiscount;//是否显示折扣标志,1是。0否 + + private String freePrice;//三包价格 + private String firstMaintainPrice;//首保价格 + + private int sortNo;//排序 +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdatePrice.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdatePrice.java new file mode 100644 index 0000000..5a519d1 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryUpdatePrice.java @@ -0,0 +1,25 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/19 + **/ +@Data +public class WarehouseInventoryUpdatePrice { + + @ApiModelProperty("销售价1/2/3/4/5") + private int type; + + private List sidsList = new ArrayList<>(); + + private String price; + + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVo.java new file mode 100644 index 0000000..5f777ca --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVo.java @@ -0,0 +1,42 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/2/26 13:37 + */ +@Data +public class WarehouseInventoryVo implements Vo { + + private String sid; + @ApiModelProperty("商品ID") + private String goodsID; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品编码") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库位名称") + private String warehouseRackCode; + @ApiModelProperty("现有库存") + private String count; + @ApiModelProperty("分配库存") + private String allocateCount; + @ApiModelProperty("可用库存") + private String useCount; + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("首次入库日期") + private String firstInDate; + @ApiModelProperty("库龄") + private String dateAge; + +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVoExcelVo.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVoExcelVo.java new file mode 100644 index 0000000..12c49dd --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryVoExcelVo.java @@ -0,0 +1,54 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import com.yxt.common.core.utils.ExportEntityMap; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/19 + **/ +@Data +public class WarehouseInventoryVoExcelVo { + + @ExportEntityMap(CnName = "序号", EnName = "rankNo") + private Integer rankNo; + @ExportEntityMap(CnName = "商品名称", EnName = "goodsSpuName") + private String goodsSpuName; + @ExportEntityMap(CnName = "商品编码（图号）", EnName = "goodsSkuCode") + private String goodsSkuCode; + @ExportEntityMap(CnName = "规格型号", EnName = "goodsSkuOwnSpec") + private String goodsSkuOwnSpec;//规格型号 + @ExportEntityMap(CnName = "销售价格1", EnName = "price1") + private String price1;//销售价格1 + @ExportEntityMap(CnName = "销售价格2", EnName = "price2") + private String price2;//销售价格2 + @ExportEntityMap(CnName = "销售价格3", EnName = "price3") + private String price3;//销售价格3 + @ExportEntityMap(CnName = "销售价格4", EnName = "price4") + private String price4;//销售价格4 + @ExportEntityMap(CnName = "销售价格5", EnName = "price5") + private String price5;//销售价格5 + @ExportEntityMap(CnName = "计量单位", EnName = "unit") + private String unit;//计量单位 + @ExportEntityMap(CnName = "库存数量", EnName = "count") + private String count;//库存数量 + @ExportEntityMap(CnName = "销售底价", EnName = "minimumPrice") + private String minimumPrice;//销售底价 + @ExportEntityMap(CnName = "三包价格", EnName = "freePrice") + private String freePrice;//三包价格 + @ExportEntityMap(CnName = "首保价格", EnName = "firstMaintainPrice") + private String firstMaintainPrice;//首保价格 + @ExportEntityMap(CnName = "仓库名称", EnName = "warehouseName") + private String warehouseName;//仓库名称 + @ExportEntityMap(CnName = "库区名称", EnName = "warehouseArea") + private String warehouseArea;//库区名称 + @ExportEntityMap(CnName = "货架名称", EnName = "warehouseRackName") + private String warehouseRackName;//warehouseRackName + @ExportEntityMap(CnName = "首次入库日期", EnName = "firstInDate") + private String firstInDate;//首次入库日期-计算库龄的依据 + @ExportEntityMap(CnName = "锁定数量", EnName = "lockCount") + private String lockCount;//锁定数量，计算字段，出库申请通过，但未实际出库 + @ExportEntityMap(CnName = "排序", EnName = "sortNo") + private String sortNo; +} diff --git a/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseUpdateCountQuery.java b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseUpdateCountQuery.java new file mode 100644 index 0000000..08de11b --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseUpdateCountQuery.java @@ -0,0 +1,17 @@ +package com.yxt.wms.biz.func.warehousesinventory; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author Fan + * @description + * @date 2024/3/20 9:14 + */ +@Data +public class WarehouseUpdateCountQuery { + private String sid; + private BigDecimal count; + private Integer addOrReduce; // 0增加 1减少 +} diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java index b921230..11d995f 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java @@ -3,9 +3,7 @@ package com.yxt.wms.feign.base.basesupplierinfo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.aggregation.supplier.SupplierInfoDto; -import com.yxt.wms.biz.aggregation.supplier.SupplierInfoQuery; -import com.yxt.wms.biz.func.basesupplierinfo.*; +import com.yxt.wms.biz.func.supplierinfo.*; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -25,16 +23,16 @@ public interface BaseSupplierInfoFeign { @ApiOperation("根据SID获取供应商") @GetMapping("/fetchDetailsBySid/{sid}") - ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("新增或修改") @PostMapping("/save") - public ResultBean save(@RequestBody BaseSupplierInfoDto dto); + public ResultBean save(@RequestBody SupplierInfoDto dto); @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") @@ -44,5 +42,5 @@ public interface BaseSupplierInfoFeign { @ApiOperation("选择供应商") @PostMapping("/choiceSupplierInfo") - public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid); + public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid); } diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java index 14eb3b5..1469134 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java @@ -3,9 +3,7 @@ package com.yxt.wms.feign.base.basesupplierinfo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.aggregation.supplier.SupplierInfoDto; -import com.yxt.wms.biz.aggregation.supplier.SupplierInfoQuery; -import com.yxt.wms.biz.func.basesupplierinfo.*; +import com.yxt.wms.biz.func.supplierinfo.*; import org.springframework.stereotype.Component; import java.util.List; @@ -19,17 +17,17 @@ public class BaseSupplierInfoFeignFallback implements BaseSupplierInfoFeign { @Override - public ResultBean fetchDetailsBySid(String sid) { + public ResultBean fetchDetailsBySid(String sid) { return null; } @Override - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(PagerQuery pq) { return null; } @Override - public ResultBean save(BaseSupplierInfoDto dto) { + public ResultBean save(SupplierInfoDto dto) { return null; } @@ -40,7 +38,7 @@ public class BaseSupplierInfoFeignFallback implements BaseSupplierInfoFeign { } @Override - public ResultBean> choiceSupplierInfo(String createOrgSid) { + public ResultBean> choiceSupplierInfo(String createOrgSid) { return null; } } diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierbank/SupplierBankFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierbank/SupplierBankFeign.java new file mode 100644 index 0000000..0a0fbeb --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierbank/SupplierBankFeign.java @@ -0,0 +1,52 @@ +package com.yxt.wms.feign.supplier.supplierbank; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierbank.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区") +@FeignClient( + contextId = "ss-common-supplier-SupplierBank", + name = "ss-common-supplier", + path = "/apiadmin/supplierbank", + fallback = SupplierBankFeignFallback.class) +public interface SupplierBankFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierBankDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierbank/SupplierBankFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierbank/SupplierBankFeignFallback.java new file mode 100644 index 0000000..9ef37c6 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierbank/SupplierBankFeignFallback.java @@ -0,0 +1,49 @@ +package com.yxt.wms.feign.supplier.supplierbank; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierbank.*; +import com.yxt.wms.biz.func.warehousearea.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierBankFeignFallback implements SupplierBankFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierBankDto dto) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierfile/SupplierFileFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierfile/SupplierFileFeign.java new file mode 100644 index 0000000..acb4b65 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierfile/SupplierFileFeign.java @@ -0,0 +1,52 @@ +package com.yxt.wms.feign.supplier.supplierfile; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierfile.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区") +@FeignClient( + contextId = "ss-common-supplier-SupplierFile", + name = "ss-common-supplier", + path = "/apiadmin/SupplierFile", + fallback = SupplierFileFeignFallback.class) +public interface SupplierFileFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierFileDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierfile/SupplierFileFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierfile/SupplierFileFeignFallback.java new file mode 100644 index 0000000..e3058a6 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierfile/SupplierFileFeignFallback.java @@ -0,0 +1,52 @@ +package com.yxt.wms.feign.supplier.supplierfile; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierfile.SupplierFileDetailsVo; +import com.yxt.wms.biz.func.supplierfile.SupplierFileDto; +import com.yxt.wms.biz.func.supplierfile.SupplierFileQuery; +import com.yxt.wms.biz.func.supplierfile.SupplierFileVo; +import com.yxt.wms.biz.func.warehousearea.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierFileFeignFallback implements SupplierFileFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierFileDto dto) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierinfo/SupplierInfoFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierinfo/SupplierInfoFeign.java new file mode 100644 index 0000000..d00804c --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierinfo/SupplierInfoFeign.java @@ -0,0 +1,55 @@ +package com.yxt.wms.feign.supplier.supplierinfo; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierinfo.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区") +@FeignClient( + contextId = "ss-common-supplier-SupplierInfo", + name = "ss-common-supplier", + path = "/apiadmin/supplierinfo", + fallback = SupplierInfoFeignFallback.class) +public interface SupplierInfoFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierInfoDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("选择供应商") + @PostMapping("/choiceSupplierInfo") + public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid); +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierinfo/SupplierInfoFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierinfo/SupplierInfoFeignFallback.java new file mode 100644 index 0000000..c3ac215 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/supplierinfo/SupplierInfoFeignFallback.java @@ -0,0 +1,56 @@ +package com.yxt.wms.feign.supplier.supplierinfo; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.supplierinfo.*; +import com.yxt.wms.biz.func.warehousearea.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierInfoFeignFallback implements SupplierInfoFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierInfoDto dto) { + return null; + } + + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean> choiceSupplierInfo(String createOrgSid) { + return null; + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/suppliertype/SupplierTypeFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/suppliertype/SupplierTypeFeign.java new file mode 100644 index 0000000..66f824c --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/suppliertype/SupplierTypeFeign.java @@ -0,0 +1,60 @@ +package com.yxt.wms.feign.supplier.suppliertype; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.suppliertype.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "库区") +@FeignClient( + contextId = "ss-common-supplier-SupplierType", + name = "ss-common-supplier", + path = "/apiadmin/suppliertype", + fallback = SupplierTypeFeignFallback.class) +public interface SupplierTypeFeign { + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("保存修改") + @PostMapping("/save") + public ResultBean save(@RequestBody SupplierTypeDto dto); + + @ApiOperation("初始化") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkSaveCode/{supplierTypeCode}/{useOrgSid}") + public ResultBean checkSaveCode(@PathVariable("supplierTypeCode") String supplierTypeCode, + @PathVariable("useOrgSid") String useOrgSid); + @ApiOperation("根据SID获取一条记录") + @GetMapping("/checkUpdateCode/{supplierTypeCode}/{useOrgSid}/{dtoSid}") + public ResultBean checkUpdateCode(@PathVariable("supplierTypeCode") String supplierTypeCode, + @PathVariable("useOrgSid") String useOrgSid, + @PathVariable("dtoSid")String dtoSid); + +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/supplier/suppliertype/SupplierTypeFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/suppliertype/SupplierTypeFeignFallback.java new file mode 100644 index 0000000..1f91a8f --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/supplier/suppliertype/SupplierTypeFeignFallback.java @@ -0,0 +1,62 @@ +package com.yxt.wms.feign.supplier.suppliertype; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.suppliertype.SupplierTypeDetailsVo; +import com.yxt.wms.biz.func.suppliertype.SupplierTypeDto; +import com.yxt.wms.biz.func.suppliertype.SupplierTypeQuery; +import com.yxt.wms.biz.func.suppliertype.SupplierTypeVo; +import com.yxt.wms.biz.func.warehousearea.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class SupplierTypeFeignFallback implements SupplierTypeFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(SupplierTypeDto dto) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean checkSaveCode(String supplierTypeCode, String useOrgSid) { + return null; + } + + @Override + public ResultBean checkUpdateCode(String supplierTypeCode, String useOrgSid, String dtoSid) { + return null; + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java index b324609..5495510 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousearea/WarehouseAreaFeign.java @@ -35,7 +35,7 @@ import java.util.List; public interface WarehouseAreaFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody WarehouseAreaQuery query); + public ResultBean> listPage(@RequestBody PagerQuery query); @ApiOperation("查询所有的库区") @GetMapping("/listAll") public ResultBean> listAll(); diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java index 0ab143d..db2640b 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseareatype/WarehouseAreaTypeFeign.java @@ -38,7 +38,7 @@ import java.util.List; public interface WarehouseAreaTypeFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody WarehouseAreaTypeQuery query); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("查询所有的") @GetMapping("/listAll/{useOrgSid}") public ResultBean> listAll(@PathVariable("useOrgSid")String useOrgSid); diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java index 85b2f47..513d984 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinfo/WarehouseFeign.java @@ -35,7 +35,7 @@ import java.util.List; public interface WarehouseFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody WarehouseInfoQuery query); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("查询所有的仓库") @GetMapping("/listAll/{useOrgSid}") public ResultBean> listAll(@PathVariable("useOrgSid") String useOrgSid); diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeign.java new file mode 100644 index 0000000..2381b4a --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeign.java @@ -0,0 +1,56 @@ +package com.yxt.wms.feign.warehouse.warehouseinventorycheckbill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillDetailsVo; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillDto; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillQuery; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillVo; +import com.yxt.wms.biz.func.warehousesinventory.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "收货单据") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseInventoryCheckbill", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseinventoryheckbill", + fallback = WarehouseInventoryCheckbillFeignFallback.class) +public interface WarehouseInventoryCheckbillFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WarehouseInventoryCheckbillDto dto); + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("盘点") + @PostMapping("/inven") + public ResultBean inven(@RequestBody WarehouseInventoryCheckbillDto dto); +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeignFallback.java new file mode 100644 index 0000000..52d6dea --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseinventorycheckbill/WarehouseInventoryCheckbillFeignFallback.java @@ -0,0 +1,54 @@ +package com.yxt.wms.feign.warehouse.warehouseinventorycheckbill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillDetailsVo; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillDto; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillQuery; +import com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillVo; +import com.yxt.wms.biz.func.warehousesinventory.*; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseInventoryCheckbillFeignFallback implements WarehouseInventoryCheckbillFeign { + + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean save(WarehouseInventoryCheckbillDto dto) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return null; + } + + @Override + public ResultBean inven(WarehouseInventoryCheckbillDto dto) { + return null; + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousereceiptbill/WarehouseReceiptBillFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousereceiptbill/WarehouseReceiptBillFeign.java index 41e671a..4831cc0 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousereceiptbill/WarehouseReceiptBillFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousereceiptbill/WarehouseReceiptBillFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; @FeignClient( contextId = "ss-common-warehouse-WarehouseReceiptBill", name = "ss-common-warehouse", - path = "/apiadmin/inventory/WarehouseReceiptBill", + path = "/apiadmin/inventory/warehousereceiptbill", fallback = WarehouseReceiptBillFeignFallback.class) public interface WarehouseReceiptBillFeign { diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseshelfbill/WarehouseShelfBillFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseshelfbill/WarehouseShelfBillFeign.java index 86e0b26..ae83719 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseshelfbill/WarehouseShelfBillFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehouseshelfbill/WarehouseShelfBillFeign.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*; @FeignClient( contextId = "ss-common-warehouse-WarehouseShelfBill", name = "ss-common-warehouse", - path = "/apiadmin/inventory/WarehouseShelfBill", + path = "/apiadmin/warehouseshelfbill", fallback = WarehouseShelfBillFeignFallback.class) public interface WarehouseShelfBillFeign { diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java new file mode 100644 index 0000000..0c9ceb2 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java @@ -0,0 +1,95 @@ +package com.yxt.wms.feign.warehouse.warehousesinventory; + +import com.yxt.common.base.utils.ExportExcelUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseshelfbill.*; +import com.yxt.wms.biz.func.warehousesinventory.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "收货单据") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseInventory", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseinventory", + fallback = WarehouseInventoryFeignFallback.class) +public interface WarehouseInventoryFeign { + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("删除/批量删除") + @DeleteMapping("/delBySids") + ResultBean delBySids(@RequestBody String[] sids); + + + @PostMapping("/exportExcel") + @ApiOperation(value = "导出") + public void exportExcel(@RequestBody WarehouseInventoryQuery query); + + @ApiOperation("修改库存数量") + @PostMapping("/updateInventoryCount") + ResultBean updateInventoryCount(@RequestBody WarehouseUpdateCountQuery query); + + @ApiOperation("销售开单选择商品分页列表") + @PostMapping("/listPageSales") + public ResultBean> listPageSales(@RequestBody PagerQuery pq); + + @ApiOperation("查询部门下所有的商品信息") + @PostMapping("/getPackageGoodsVo") + public ResultBean> getPackageGoodsVo(@RequestBody PagerQuery pq); + + @ApiOperation("库龄查询") + @PostMapping("/inventoryAgeList") + public ResultBean> inventoryAgeList(@RequestBody PagerQuery pq); + + @PostMapping("/ageExportExcel") + @ApiOperation(value = "库龄查询导出") + public void ageExportExcel(@RequestBody WarehouseInventoryAgeQuery query); + + @ApiOperation("根据商品sid查询库存信息") + @PostMapping("/selectInvenBySkuSid") + public ResultBean selectInvenBySkuSid(@RequestParam("skuSid") String skuSid); + + @ApiOperation("盘库商品分页列表") + @PostMapping("/invenGoodsListPage") + public ResultBean> invenGoodsListPage(@RequestBody PagerQuery pq); + + @ApiOperation("调拨商品分页列表") + @PostMapping("/alloGoodsListPage") + public ResultBean> alloGoodsListPage(@RequestBody PagerQuery pq); + + @ApiOperation("旧件返厂商品分页列表") + @PostMapping("/returnGoodsListPage") + public ResultBean> returnGoodsListPage(@RequestBody PagerQuery pq); + + @ApiOperation("旧件处理商品分页列表") + @PostMapping("/handleGoodsListPage") + public ResultBean> handleGoodsListPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据Sid获取库存实体") + @PostMapping("/fetchEntityBySid") + ResultBean fetchEntityBySid(@RequestParam("sid") String sid); +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java new file mode 100644 index 0000000..44a99c1 --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java @@ -0,0 +1,95 @@ +package com.yxt.wms.feign.warehouse.warehousesinventory; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseshelfbill.*; +import com.yxt.wms.biz.func.warehousesinventory.*; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseInventoryFeignFallback implements WarehouseInventoryFeign { + + @Override + public ResultBean> listPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean delBySids(String[] sids) { + return null; + } + + @Override + public void exportExcel(WarehouseInventoryQuery query) { + + } + + @Override + public ResultBean updateInventoryCount(WarehouseUpdateCountQuery query) { + return null; + } + + @Override + public ResultBean> listPageSales(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> getPackageGoodsVo(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> inventoryAgeList(PagerQuery pq) { + return null; + } + + @Override + public void ageExportExcel(WarehouseInventoryAgeQuery query) { + + } + + @Override + public ResultBean selectInvenBySkuSid(String skuSid) { + return null; + } + + @Override + public ResultBean> invenGoodsListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> alloGoodsListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> returnGoodsListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean> handleGoodsListPage(PagerQuery pq) { + return null; + } + + @Override + public ResultBean fetchEntityBySid(String sid) { + return null; + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java new file mode 100644 index 0000000..e0999fa --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java @@ -0,0 +1,52 @@ +package com.yxt.wms.feign.warehouse.warehousesoutbill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseoutbill.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "收货单据") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseOutBill", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseoutbill", + fallback = WarehouseOutBillFeignFallback.class) +public interface WarehouseOutBillFeign { + + @ApiOperation("分页列表") + @PostMapping("/listPage") + ResultBean> pageList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("出库保存修改") + @PostMapping("/saveOrUpdateOutBill") + ResultBean saveOrUpdateOutBill(@RequestBody WarehouseOutBillDto dto); + + @ApiOperation("详情") + @GetMapping("/details") + ResultBean details(@RequestParam("sid") String sid); + + @ApiOperation("选择商品分页列表") + @PostMapping("/getInventoryList") + ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("确认") + @PostMapping("/confirm") + ResultBean confirm(@RequestBody WarehouseOutBillDto dto); +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java new file mode 100644 index 0000000..0239b5a --- /dev/null +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java @@ -0,0 +1,50 @@ +package com.yxt.wms.feign.warehouse.warehousesoutbill; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseoutbill.*; +import org.springframework.stereotype.Component; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseOutBillFeignFallback implements WarehouseOutBillFeign { + + + @Override + public ResultBean> pageList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean saveOrUpdateOutBill(WarehouseOutBillDto dto) { + return null; + } + + @Override + public ResultBean details(String sid) { + return null; + } + + @Override + public ResultBean> getInventoryList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean confirm(WarehouseOutBillDto dto) { + return null; + } +} \ No newline at end of file diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmsansbill/WmsAnsBillFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmsansbill/WmsAnsBillFeign.java index a7dd261..fd3d1d8 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmsansbill/WmsAnsBillFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmsansbill/WmsAnsBillFeign.java @@ -29,7 +29,7 @@ import org.springframework.web.bind.annotation.*; @FeignClient( contextId = "ss-common-warehouse-WmsAnsBill", name = "ss-common-warehouse", - path = "/apiadmin/inventory/WmsAnsBill", + path = "/apiadmin/warehouseansbill", fallback = WmsAnsBillFeignFallback.class) public interface WmsAnsBillFeign { diff --git a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java index ecfe37a..1ad8b15 100644 --- a/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java +++ b/wms-biz/src/main/java/com/yxt/wms/feign/warehouse/wmswarehouserack/WarehouseRackFeign.java @@ -38,7 +38,7 @@ public interface WarehouseRackFeign { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody WarehouseRackQuery query); + public ResultBean> listPage(@RequestBody PagerQuery pq); @ApiOperation("查询所有的库区") @GetMapping("/getAllType") public ResultBean getAllType();