6/24

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-(供应商管理) <br/>
+ * File: SupplierBankFeignFallback.java <br/>
+ * Class: com.yxt..biz.supplierbank.SupplierBankRest <br/>
+ * Description: 供应商开户行信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-18 13:33:13 <br/>
+ *
+ * @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<PagerVo<SupplierBankVo>> listPage(@RequestBody PagerQuery<SupplierBankQuery> 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<SupplierBankDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return supplierBankService.fetchDetailsVoBySid(sid);
+	}
+}

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-(仓储基础信息供应商) <br/>
+ * File: SupplierFileFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.supplierfile.SupplierFileRest <br/>
+ * Description: 供应商附件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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<PagerVo<SupplierFileVo>> listPage(@RequestBody PagerQuery<SupplierFileQuery> 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<SupplierFileDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return supplierFileService.fetchDetailsVoBySid(sid);
+	}
+}

wms-biz/src/main/java/com/yxt/wms/apiadmin/aggregation/BaseSupplierInfoRest.java → 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")
+@RequestMapping("/apiadmin/supplierinfo")
-public class BaseSupplierInfoRest {
+public class SupplierInfoRest {
 
 	@Autowired
-	private BaseSupplierInfoService baseSupplierInfoService;
+	private SupplierInfoService baseSupplierInfoService;
 
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BaseSupplierInfoVo>> listPage(@RequestBody PagerQuery<BaseSupplierInfoQuery> pq){
+	public ResultBean<PagerVo<SupplierInfoVo>> listPage(@RequestBody PagerQuery<SupplierInfoQuery> 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<BaseSupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+    public ResultBean<SupplierInfoDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
 		return baseSupplierInfoService.fetchDetailsVoBySid(sid);
 	}
 
 	@ApiOperation("选择供应商")
 	@PostMapping("/choiceSupplierInfo")
-	public ResultBean<List<BaseSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){
+	public ResultBean<List<SupplierInfoChoice>> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){
 		return baseSupplierInfoService.choiceSupplierInfo(createOrgSid);
 	}
 }

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-(仓储基础信息供应商) <br/>
+ * File: SupplierTypeFeignFallback.java <br/>
+ * Class: com.yxt.anrui.as.biz.suppliertype.SupplierTypeRest <br/>
+ * Description: 供应商类型. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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<PagerVo<SupplierTypeVo>> listPage(@RequestBody PagerQuery<SupplierTypeQuery> 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<SupplierTypeDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		return supplierTypeService.fetchDetailsVoBySid(sid);
+	}
+}

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(仓储) <br/>
+ * File: WarehouseInventoryCheckbillFeignFallback.java <br/>
+ * Class: com.yxt.Warehouse.biz.Warehouseinventorycheckbill.WarehouseInventoryCheckbillRest <br/>
+ * Description: 库存盘点. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @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<PagerVo<WarehouseInventoryCheckbillVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryCheckbillQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<WarehouseInventoryCheckbillVo> 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<WarehouseInventoryCheckbillDetailsVo> 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();
+	}
+}

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<PagerVo<WarehouseInventoryVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryQuery> 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<PagerVo<WarehouseInventorySalesVo>> listPageSales(@RequestBody PagerQuery<WarehouseInventorySalesQuery> pq) {
+        return warehouseInventoryService.listPageSales(pq);
+    }
+
+    @ApiOperation("查询部门下所有的商品信息")
+    @PostMapping("/getPackageGoodsVo")
+    public ResultBean<PagerVo<WarehouseInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WarehouseInventoryPackageQuery> pq) {
+        return warehouseInventoryService.getPackageGoodsVo(pq);
+    }
+
+    @ApiOperation("库龄查询")
+    @PostMapping("/inventoryAgeList")
+    public ResultBean<PagerVo<WarehouseInventoryAgeVo>> inventoryAgeList(@RequestBody PagerQuery<WarehouseInventoryAgeQuery> pq) {
+        return warehouseInventoryService.inventoryAgeList(pq);
+    }
+
+    @PostMapping("/ageExportExcel")
+    @ApiOperation(value = "库龄查询导出")
+    public void ageExportExcel(@RequestBody WarehouseInventoryAgeQuery query) {
+        warehouseInventoryService.ageExportExcel(query);
+    }
+
+    @ApiOperation("根据商品sid查询库存信息")
+    @PostMapping("/selectInvenBySkuSid")
+    public ResultBean<WarehouseGoodsInventoryVo> selectInvenBySkuSid(@RequestParam("skuSid") String skuSid) {
+        return warehouseInventoryService.selectInvenBySkuSid(skuSid);
+    }
+
+    @ApiOperation("盘库商品分页列表")
+    @PostMapping("/invenGoodsListPage")
+    public ResultBean<PagerVo<WarehouseInventoryInvenSelectList>> invenGoodsListPage(@RequestBody PagerQuery<WarehouseInventoryInvenSelectQuery> pq) {
+        return warehouseInventoryService.invenGoodsListPage(pq);
+    }
+
+    @ApiOperation("调拨商品分页列表")
+    @PostMapping("/alloGoodsListPage")
+    public ResultBean<PagerVo<WarehouseInventoryAlloSelectList>> alloGoodsListPage(@RequestBody PagerQuery<WarehouseInventoryAlloSelectQuery> pq) {
+        return warehouseInventoryService.alloGoodsListPage(pq);
+    }
+
+    @ApiOperation("旧件返厂商品分页列表")
+    @PostMapping("/returnGoodsListPage")
+    public ResultBean<PagerVo<WarehouseInventoryReturnSelectList>> returnGoodsListPage(@RequestBody PagerQuery<WarehouseInventoryReturnSelectQuery> pq) {
+        return warehouseInventoryService.returnGoodsListPage(pq);
+    }
+
+    @ApiOperation("旧件处理商品分页列表")
+    @PostMapping("/handleGoodsListPage")
+    public ResultBean<PagerVo<WarehouseInventoryHandleSelectList>> handleGoodsListPage(@RequestBody PagerQuery<WarehouseInventoryHandleSelectQuery> pq) {
+        return warehouseInventoryService.handleGoodsListPage(pq);
+    }
+
+    @ApiOperation("根据Sid获取库存实体")
+    @PostMapping("/fetchEntityBySid")
+    ResultBean<WarehouseInventory> fetchEntityBySid(@RequestParam("sid") String sid) {
+        return warehouseInventoryService.fetchEntityBySid(sid);
+    }
+
+}

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<PagerVo<WarehouseOutBillVo>> pageList(@RequestBody PagerQuery<WarehouseOutBillQuery> pagerQuery) {
+        return warehouseOutBillService.listPage(pagerQuery);
+    }
+
+    @ApiOperation("出库保存修改")
+    @PostMapping("/saveOrUpdateOutBill")
+    ResultBean<String> saveOrUpdateOutBill(@RequestBody WarehouseOutBillDto dto) {
+        return warehouseOutBillService.saveOrUpdateOutBill(dto);
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("/details")
+    ResultBean<WarehouseOutBillDetailsVo> details(@RequestParam("sid") String sid) {
+        return warehouseOutBillService.details(sid);
+    }
+
+    @ApiOperation("选择商品分页列表")
+    @PostMapping("/getInventoryList")
+    ResultBean<PagerVo<WarehouseOutBillInventoryVo>> getInventoryList(@RequestBody PagerQuery<WarehouseOutBillInventoryQuery> pagerQuery) {
+        return warehouseOutBillService.getInventoryList(pagerQuery);
+    }
+
+    @ApiOperation("确认")
+    @PostMapping("/confirm")
+    ResultBean confirm(@RequestBody WarehouseOutBillDto dto) {
+        return warehouseOutBillService.confirm(dto);
+    }
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfo.java

@@ -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(供应商管理) <br/>
- * File: BaseSupplierInfo.java <br/>
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfo <br/>
- * Description: 供应商信息. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-18 13:33:13 <br/>
- *
- * @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
-
-}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDetailsVo.java

@@ -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(供应商管理) <br/>
- * File: BaseSupplierInfoVo.java <br/>
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo <br/>
- * Description: 供应商信息 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-18 13:33:13 <br/>
- *
- * @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<BaseSupplierBankDetailsVo> baseSupplierBankList;
-}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoDto.java

@@ -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(供应商管理) <br/>
- * File: BaseSupplierInfoDto.java <br/>
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoDto <br/>
- * Description: 供应商信息 数据传输对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-18 13:33:13 <br/>
- *
- * @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<BaseSupplierBankDto> baseSupplierBankList;
-}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoVo">
-		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.basesupplierinfo.BaseSupplierInfoVo">
-		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
-	</select>
-</mapper>

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBank.java → 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")

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDetailsVo.java → 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
 

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankDto.java → 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
 

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.java → 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<BaseSupplierBank> {
+public interface SupplierBankMapper extends BaseMapper<SupplierBank> {
 
-	IPage<BaseSupplierBankVo> selectPageVo(IPage<BaseSupplierBank> page, @Param(Constants.WRAPPER) Wrapper<BaseSupplierBank> qw);
+	IPage<SupplierBankVo> selectPageVo(IPage<SupplierBank> page, @Param(Constants.WRAPPER) Wrapper<SupplierBank> qw);
 	
-	List<BaseSupplierBankVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseSupplierBank> qw);
+	List<SupplierBankVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SupplierBank> qw);
 	
 	@Select("select * from base_supplier_bank")
-	List<BaseSupplierBankVo> selectListVo();
+	List<SupplierBankVo> selectListVo();
 
 	@Delete("delete from base_supplier_bank where supplierSid = #{supplierSid}")
     int deleteBySupplierSid(String supplierSid);
 
 	@Select("select * from base_supplier_bank where supplierSid = #{supplierSid}")
-	List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid);
+	List<SupplierBankDetailsVo> selectBySupplierSid(String supplierSid);
 }

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/supplierbank/SupplierBankMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankMapper">
+<mapper namespace="com.yxt.wms.biz.func.supplierbank.SupplierBankMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankVo">
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.supplierbank.SupplierBankVo">
 		SELECT * FROM base_supplier_bank <where> ${ew.sqlSegment} </where>
 	</select>
 	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.basesupplierBank.BaseSupplierBankVo">
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.supplierbank.SupplierBankVo">
 		SELECT * FROM base_supplier_bank <where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankQuery.java → 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

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(供应商管理) <br/>
+ * File: BaseSupplierBankService.java <br/>
+ * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankService <br/>
+ * Description: 供应商开户行信息 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-18 13:33:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SupplierBankService extends MybatisBaseService<SupplierBankMapper, SupplierBank> {
+	@Autowired
+	SupplierBankFeign supplierBankFeign;
+	public ResultBean<PagerVo<SupplierBankVo>> listPageVo(PagerQuery<SupplierBankQuery> pq) {
+		return supplierBankFeign.listPage(pq);
+	}
+	
+	public ResultBean saveOrUpdateDto(SupplierBankDto dto){
+		return supplierBankFeign.save(dto);
+	}
+
+	public ResultBean<SupplierBankDetailsVo> fetchDetailsVoBySid(String sid){
+		return supplierBankFeign.fetchDetailsBySid(sid);
+	}
+
+	public ResultBean delAll(String[] sids) {
+		return supplierBankFeign.delBySids(sids);
+	}
+
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankVo.java → 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
 

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierFile.java <br/>
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFile <br/>
+ * Description: 供应商附件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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; // 文件的路径
+
+}

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierFileVo.java <br/>
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo <br/>
+ * Description: 供应商附件 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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; // 文件的路径
+
+}

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierFileDto.java <br/>
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileDto <br/>
+ * Description: 供应商附件 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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; // 文件的路径
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoMapper.java → 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(仓储基础信息供应商) <br/>
- * File: BaseSupplierInfoMapper.java <br/>
+ * File: BaseSupplierFileMapper.java <br/>
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoMapper <br/>
+ * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileMapper <br/>
- * Description: 供应商信息. <br/>
+ * Description: 供应商附件. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
  * Makedate: 2024-03-13 16:51:56 <br/>
@@ -50,18 +49,12 @@ import java.util.List;
  * @since 1.0
  */
 @Mapper
-public interface BaseSupplierInfoMapper extends BaseMapper<BaseSupplierInfo> {
+public interface SupplierFileMapper extends BaseMapper<SupplierFile> {
 
-	IPage<BaseSupplierInfoVo> selectPageVo(IPage<BaseSupplierInfo> page, @Param(Constants.WRAPPER) Wrapper<BaseSupplierInfo> qw);
+	IPage<SupplierFileVo> selectPageVo(IPage<SupplierFile> page, @Param(Constants.WRAPPER) Wrapper<SupplierFile> qw);
 	
-	List<BaseSupplierInfoVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseSupplierInfo> qw);
+	List<SupplierFileVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SupplierFile> qw);
 	
-	@Select("select * from base_supplier_info")
+	@Select("select * from base_supplier_file")
-	List<BaseSupplierInfoVo> selectListVo();
+	List<SupplierFileVo> selectListVo();
-
-	@Update("update base_supplier_info set isDelete = '1' where sid = #{sid}")
-    int updateBySidIsDelete(String sid);
-
-	@Select("select * from base_supplier_info")
-    List<BaseSupplierInfoChoice> choiceSupplierInfo(String createOrgSid);
 }

wms-biz/src/main/java/com/yxt/wms/biz/func/supplierfile/SupplierFileMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.supplierfile.SupplierFileMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.supplierfile.SupplierFileVo">
+		SELECT * FROM base_supplier_file <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.supplierfile.SupplierFileVo">
+		SELECT * FROM base_supplier_file <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierFileQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileQuery <br/>
+ * Description: 供应商附件 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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; // 文件的路径
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoService.java → 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(仓储基础信息供应商) <br/>
- * File: BaseSupplierInfoService.java <br/>
+ * File: BaseSupplierFileService.java <br/>
- * Class: com.yxt.anrui.as.biz.basesupplierinfo.BaseSupplierInfoService <br/>
+ * Class: com.yxt.anrui.as.biz.basesupplierfile.BaseSupplierFileService <br/>
- * Description: 供应商信息 业务逻辑. <br/>
+ * Description: 供应商附件 业务逻辑. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
  * Makedate: 2024-03-13 16:51:56 <br/>
@@ -49,40 +52,22 @@ import java.util.List;
  * @since 1.0
  */
 @Service
-public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfoMapper, BaseSupplierInfo> {
+public class SupplierFileService extends MybatisBaseService<SupplierFileMapper, SupplierFile> {
-
-//	@Autowired
-//	private SysStaffOrgFeign sysStaffOrgFeign;
-//	@Autowired
-//	private SysOrganizationFeign sysOrganizationFeign;
-//	@Autowired
-//	private BaseSupplierBankService baseSupplierBankService;
 	@Autowired
-	BaseSupplierInfoFeign baseSupplierInfoFeign;
+	SupplierFileFeign supplierFileFeign;
-
+	public ResultBean<PagerVo<SupplierFileVo>> listPageVo(PagerQuery<SupplierFileQuery> pq) {
-	public ResultBean<PagerVo<BaseSupplierInfoVo>> listPageVo(PagerQuery<BaseSupplierInfoQuery> pq) {
+		return supplierFileFeign.listPage(pq);
-		BaseSupplierInfoQuery query = pq.getParams();
-		return baseSupplierInfoFeign.listPage(pq);
 	}
 	
-	public ResultBean saveOrUpdateDto(BaseSupplierInfoDto dto){
+	public ResultBean saveOrUpdateDto(SupplierFileDto dto){
-		return baseSupplierInfoFeign.save(dto);
+		return supplierFileFeign.save(dto);
 	}
-
+	public ResultBean delAll(String[] sids ){
-	public ResultBean<BaseSupplierInfoDetailsVo> fetchDetailsVoBySid(String sid){
+		return supplierFileFeign.delBySids(sids);
-		return baseSupplierInfoFeign.fetchDetailsBySid(sid);
 	}
 
-	public void delAll(String[] sids) {
+	public ResultBean<SupplierFileDetailsVo> fetchDetailsVoBySid(String sid){
-		for (String sid : sids) {
-			//删除厂商基础信息
-			int count = baseMapper.updateBySidIsDelete(sid);
-			//删除厂商开户行信息
-//			int i = baseSupplierBankService.deleteBySupplierSid(sid);
-		}
-	}
 
-	public ResultBean<List<BaseSupplierInfoChoice>> choiceSupplierInfo(String createOrgSid) {
+		return supplierFileFeign.fetchDetailsBySid(sid);
-		return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid);
 	}
 }

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierFileVo.java <br/>
+ * Class: com.yxt.anrui.as.api.basesupplierfile.BaseSupplierFileVo <br/>
+ * Description: 供应商附件 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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; // 文件的路径
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfo.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoChoice.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDetailsVo.java → 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<SupplierBankDetailsVo> baseSupplierBankList;
 }

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoDto.java → 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<SupplierBankDto> baseSupplierBankList;
 }

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoMapper.xml → wms-biz/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yxt.wms.biz.aggregation.supplier.SupplierInfoMapper">
+<mapper namespace="com.yxt.wms.biz.func.supplierinfo.SupplierInfoMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.wms.biz.aggregation.supplier.SupplierInfoVo">
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.supplierinfo.SupplierInfoVo">
 		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
 	</select>
 	
-	<select id="selectListAllVo" resultType="com.yxt.wms.biz.aggregation.supplier.SupplierInfoVo">
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.supplierinfo.SupplierInfoVo">
 		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
 	</select>
 </mapper>

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoQuery.java → 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;

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoService.java → 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<SupplierInfoMapper, SupplierInfo> {
 
+//	@Autowired
+//	private SysStaffOrgFeign sysStaffOrgFeign;
+//	@Autowired
+//	private SysOrganizationFeign sysOrganizationFeign;
+//	@Autowired
+//	private BaseSupplierBankService baseSupplierBankService;
 	@Autowired
-	BaseSupplierInfoFeign baseSupplierInfoFeign;
+	SupplierInfoFeign baseSupplierInfoFeign;
 
-	public ResultBean<PagerVo<BaseSupplierInfoVo>> listPageVo(PagerQuery<BaseSupplierInfoQuery> pq) {
+	public ResultBean<PagerVo<SupplierInfoVo>> listPageVo(PagerQuery<SupplierInfoQuery> 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<BaseSupplierInfoDetailsVo> fetchDetailsVoBySid(String sid){
+	public ResultBean<SupplierInfoDetailsVo> fetchDetailsVoBySid(String sid){
 		return baseSupplierInfoFeign.fetchDetailsBySid(sid);
 	}
 
@@ -76,7 +83,7 @@ public class SupplierInfoService extends MybatisBaseService<SupplierInfoMapper,
 		}
 	}
 
-	public ResultBean<List<BaseSupplierInfoChoice>> choiceSupplierInfo(String createOrgSid) {
+	public ResultBean<List<SupplierInfoChoice>> choiceSupplierInfo(String createOrgSid) {
 		return baseSupplierInfoFeign.choiceSupplierInfo(createOrgSid);
 	}
 }

wms-biz/src/main/java/com/yxt/wms/biz/aggregation/supplier/SupplierInfoVo.java → 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;

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierType.java <br/>
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierType <br/>
+ * Description: 供应商类型. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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
+
+}

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierTypeVo.java <br/>
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo <br/>
+ * Description: 供应商类型 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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
+
+}

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierTypeDto.java <br/>
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeDto <br/>
+ * Description: 供应商类型 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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;
+}

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierTypeMapper.java <br/>
+ * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeMapper <br/>
+ * Description: 供应商类型. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface SupplierTypeMapper extends BaseMapper<SupplierType> {
+
+	IPage<SupplierTypeVo> selectPageVo(IPage<SupplierType> page, @Param(Constants.WRAPPER) Wrapper<SupplierType> qw);
+	
+	List<SupplierTypeVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<SupplierType> qw);
+	
+	@Select("select * from base_supplier_type")
+	List<SupplierTypeVo> 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);
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/suppliertype/SupplierTypeMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.suppliertype.SupplierTypeMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.suppliertype.SupplierTypeVo">
+		SELECT * FROM base_supplier_type <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.suppliertype.SupplierTypeVo">
+		SELECT * FROM base_supplier_type <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierTypeQuery.java <br/>
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeQuery <br/>
+ * Description: 供应商类型 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @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
+
+}

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(仓储基础信息供应商) <br/>
+ * File: BaseSupplierTypeService.java <br/>
+ * Class: com.yxt.anrui.as.biz.basesuppliertype.BaseSupplierTypeService <br/>
+ * Description: 供应商类型 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class SupplierTypeService extends MybatisBaseService<SupplierTypeMapper, SupplierType> {
+
+	@Autowired
+	SupplierTypeFeign supplierTypeFeign;
+	@Autowired
+	WarehouseAreaFeign warehouseAreaFeign;
+	@Autowired
+	SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	SysUserFeign sysUserFeign;
+
+	public ResultBean<PagerVo<SupplierTypeVo>> listPageVo(PagerQuery<SupplierTypeQuery> 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<String> 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<SysOrganizationVo> 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<SupplierTypeDetailsVo> fetchDetailsVoBySid(String sid){
+		return supplierTypeFeign.fetchDetailsBySid(sid);
+	}
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoVo.java → 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(供应商管理) <br/>
+ * Project: yxt-base(仓储基础信息供应商) <br/>
- * File: BaseSupplierInfoVo.java <br/>
+ * File: BaseSupplierTypeVo.java <br/>
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo <br/>
+ * Class: com.yxt.anrui.as.api.basesuppliertype.BaseSupplierTypeVo <br/>
- * Description: 供应商信息 视图数据对象. <br/>
+ * Description: 供应商类型 视图数据对象. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-18 13:33:13 <br/>
+ * Makedate: 2024-03-13 16:51:56 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Data
-@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象")
+@ApiModel(value = "供应商类型 视图数据对象", description = "供应商类型 视图数据对象")
-public class BaseSupplierInfoVo implements Vo {
+public class SupplierTypeVo implements Vo {
 
     private String sid; // sid
 
-    @ApiModelProperty("供应商名称")
+	@ApiModelProperty("供应商类型名称")
-    private String supplierName;
+    private String supplierTypeName; // 供应商类型名称
-    @ApiModelProperty("供应商类型")
+	@ApiModelProperty("使用组织sid")
-    private String supplierTypeName;
+    private String useOrgSid; // 使用组织sid
-    @ApiModelProperty("详细地址")
+	@ApiModelProperty("创建组织名称")
-    private String address;
+    private String createOrgName; // 创建组织名称
-    @ApiModelProperty("电话")
+	@ApiModelProperty("创建组织sid")
-    private String contactTelePhone;
+    private String createOrgSid; // 创建组织sid
-    @ApiModelProperty("联系人")
+
-    private String contactName;
-    @ApiModelProperty("手机")
-    private String contactMobile;
 }

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<WarehouseArea> qw;
-    private IPage<WarehouseArea> page;
 }

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousearea/WarehouseAreaService.java

@@ -38,60 +38,13 @@ public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper
     public ResultBean<PagerVo<WarehouseAreaVo>> listPage(PagerQuery<WarehouseAreaQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaQuery query = pq.getParams();
-        QueryWrapper<WarehouseArea> qw = new QueryWrapper<>();
         PrivilegeQuery privilegeQuery = new PrivilegeQuery();
         privilegeQuery.setOrgPath(query.getOrgPath());
         privilegeQuery.setMenuUrl(query.getMenuUrl());
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+        IPage<WarehouseAreaVo> pagging = warehouseAreaFeign.listPage(pq).getData();
-            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<WarehouseAreaVo> p = new PagerVo<>();
-                return rb.success().setData(p);
-            }
-        } else {
-            PagerVo<WarehouseAreaVo> 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<WarehouseArea> page = PagerUtil.queryToPage(pq);
-        query.setPage(page);
-        query.setQw(qw);
-        IPage<WarehouseAreaVo> pagging = warehouseAreaFeign.listPage(query).getData();
         PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
         List<WarehouseAreaVo> records = pagging.getRecords();
         return rb.success().setData(p);

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<WarehouseAreaType> page;
-    private QueryWrapper<WarehouseAreaType>qw;
 }

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseareatype/WarehouseAreaTypeService.java

@@ -42,51 +42,13 @@ public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTy
     public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(PagerQuery<WarehouseAreaTypeQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseAreaTypeQuery query = pq.getParams();
-        QueryWrapper<WarehouseAreaType> qw = new QueryWrapper<>();
         PrivilegeQuery privilegeQuery = new PrivilegeQuery();
         privilegeQuery.setOrgPath(query.getOrgPath());
         privilegeQuery.setMenuUrl(query.getMenuUrl());
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+        IPage<WarehouseAreaTypeVo> pagging = warehouseAreaTypeFeign.listPage(pq).getData();
-            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<WarehouseAreaTypeVo> p = new PagerVo<>();
-                return rb.success().setData(p);
-            }
-        } else {
-            PagerVo<WarehouseAreaTypeVo> 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<WarehouseAreaType> page = PagerUtil.queryToPage(pq);
-        query.setPage(page);
-        query.setQw(qw);
-        IPage<WarehouseAreaTypeVo> pagging = warehouseAreaTypeFeign.listPage(query).getData();
         PagerVo<WarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }

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<WarehouseInfo> page;
-
-    private QueryWrapper<WarehouseInfo> qw;
 }

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinfo/WarehouseInfoService.java

@@ -40,58 +40,13 @@ public class WarehouseInfoService extends MybatisBaseService<WarehouseInfoMapper
     public ResultBean<PagerVo<WarehouseInfoVo>> listPage(PagerQuery<WarehouseInfoQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseInfoQuery query = pq.getParams();
-        QueryWrapper<WarehouseInfo> qw = new QueryWrapper<>();
         PrivilegeQuery privilegeQuery = new PrivilegeQuery();
         privilegeQuery.setOrgPath(query.getOrgPath());
         privilegeQuery.setMenuUrl(query.getMenuUrl());
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+        IPage<WarehouseInfoVo> pagging = WarehouseFeign.listPage(pq).getData();
-            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<WarehouseInfoVo> p = new PagerVo<>();
-                return rb.success().setData(p);
-            }
-        } else {
-            PagerVo<WarehouseInfoVo> 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<WarehouseInfo> page = PagerUtil.queryToPage(pq);
-        query.setPage(page);
-        query.setQw(qw);
-        IPage<WarehouseInfoVo> pagging = WarehouseFeign.listPage(query).getData();
         PagerVo<WarehouseInfoVo> p = PagerUtil.pageToVo(pagging, null);
         return rb.success().setData(p);
     }

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(仓储) <br/>
+ * File: WmsInventoryCheckbill.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbill <br/>
+ * Description: 库存盘点. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:01 <br/>
+ *
+ * @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
+
+}

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(仓储) <br/>
+ * File: WarehouseInventoryCheckbillVo.java <br/>
+ * Class: com.yxt.Warehouse.api.Warehouseinventorycheckbill.WarehouseInventoryCheckbillVo <br/>
+ * Description: 库存盘点 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @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<WarehouseInventoryCheckbillDetailDetailsVo> WarehouseInventoryCheckbillDetailList;
+}

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(仓储) <br/>
+ * File: WmsInventoryCheckbillDto.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbillDto <br/>
+ * Description: 库存盘点 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:01 <br/>
+ *
+ * @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<WarehouseInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList;
+}

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(仓储) <br/>
+ * File: WmsInventoryCheckbillMapper.java <br/>
+ * Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillMapper <br/>
+ * Description: 库存盘点. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface WarehouseInventoryCheckbillMapper extends BaseMapper<WarehouseInventoryCheckbill> {
+
+	IPage<WarehouseInventoryCheckbillVo> selectPageVo(IPage<WarehouseInventoryCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckbill> qw);
+	
+	List<WarehouseInventoryCheckbillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckbill> qw);
+	
+	@Select("select * from warehouse_inventory_checkbill")
+	List<WarehouseInventoryCheckbillVo> selectListVo();
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbill/WarehouseInventoryCheckbillMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillVo">
+		SELECT * FROM warehouse_inventory_checkbill <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.warehouseinventorycheckbill.WarehouseInventoryCheckbillVo">
+		SELECT * FROM warehouse_inventory_checkbill <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoQuery.java → 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(供应商管理) <br/>
+ * Project: yxt-wms(仓储) <br/>
- * File: BaseSupplierInfoQuery.java <br/>
+ * File: WmsInventoryCheckbillQuery.java <br/>
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoQuery <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbillQuery <br/>
- * Description: 供应商信息 查询条件. <br/>
+ * Description: 库存盘点 查询条件. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-18 13:33:13 <br/>
+ * Makedate: 2024-03-22 09:25:01 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Data
-@ApiModel(value = "供应商信息 查询条件", description = "供应商信息 查询条件")
+@ApiModel(value = "库存盘点 查询条件", description = "库存盘点 查询条件")
-public class BaseSupplierInfoQuery implements Query {
+public class WarehouseInventoryCheckbillQuery implements Query {
-
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
-    @ApiModelProperty("供应商类型")
-    private String supplierTypeName;
-    @ApiModelProperty("电话")
-    private String contactTelePhone;
-    @ApiModelProperty("联系人")
-    private String contactName;
 
+    @ApiModelProperty("创建开始日期")
+    private String createStartTime;
+    @ApiModelProperty("创建结束日期")
+    private String createEndTime;
     @ApiModelProperty("其他查询条件")
     private String otherQuery;
 }

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(仓储) <br/>
+ * File: WmsInventoryCheckbillService.java <br/>
+ * Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillService <br/>
+ * Description: 库存盘点 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class WarehouseInventoryCheckbillService extends MybatisBaseService<WarehouseInventoryCheckbillMapper, WarehouseInventoryCheckbill> {
+
+	@Autowired
+	private WarehouseInventoryCheckbillFeign warehouseInventoryCheckbillFeign;
+	
+	public PagerVo<WarehouseInventoryCheckbillVo> listPageVo(PagerQuery<WarehouseInventoryCheckbillQuery> pq) {
+
+		PagerVo<WarehouseInventoryCheckbillVo> 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<WarehouseInventoryCheckbillDetailsVo> fetchDetailsVoBySid(String sid){
+		return warehouseInventoryCheckbillFeign.fetchDetailsBySid(sid);
+	}
+
+	public void inven(WarehouseInventoryCheckbillDto dto) {
+		warehouseInventoryCheckbillFeign.inven(dto);
+	}
+}

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(仓储) <br/>
+ * File: WmsInventoryCheckbillVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbill.WmsInventoryCheckbillVo <br/>
+ * Description: 库存盘点 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:01 <br/>
+ *
+ * @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;
+}

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(仓储) <br/>
+ * File: WmsInventoryCheckbillDetail.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetail <br/>
+ * Description: 库存盘点-明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @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; // 现场照片（多张中间用英文逗号分隔）
+
+}

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(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @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<String> picUrls = new ArrayList<>();
+
+    /*
+    * 页面展示字段
+    * */
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+    @ApiModelProperty("零件号")
+    private String goodsSkuCode;
+    @ApiModelProperty("车型")
+    private String carModel;
+    @ApiModelProperty("商品单位")
+    private String unit;
+
+    /*
+    * 盘点接口需要字段
+    * */
+    @ApiModelProperty("盈亏数")
+    private BigDecimal proAndLossCount;
+}

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(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailDto.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto <br/>
+ * Description: 库存盘点-明细 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @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<String> picUrls = new ArrayList<>();
+
+    /*
+     * 页面展示字段
+     * */
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
+    @ApiModelProperty("零件号")
+    private String goodsSkuCode;
+    @ApiModelProperty("车型")
+    private String carModel;
+    @ApiModelProperty("商品单位")
+    private String unit;
+
+    /*
+     * 盘点接口需要字段
+     * */
+    @ApiModelProperty("盈亏数")
+    private BigDecimal proAndLossCount;
+}

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(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailMapper.java <br/>
+ * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailMapper <br/>
+ * Description: 库存盘点-明细. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface WarehouseInventoryCheckbillDetailMapper extends BaseMapper<WarehouseInventoryCheckbillDetail> {
+
+	IPage<WarehouseInventoryCheckbillDetailVo> selectPageVo(IPage<WarehouseInventoryCheckbillDetail> page, @Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckbillDetail> qw);
+
+	List<WarehouseInventoryCheckbillDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckbillDetail> qw);
+
+	@Select("select * from warehouse_inventory_checkbill_detail")
+	List<WarehouseInventoryCheckbillDetailVo> selectListVo();
+
+	@Delete("delete from warehouse_inventory_checkbill_detail where billSid = #{dtoSid}")
+	void delByMainSid(String dtoSid);
+
+	List<WarehouseInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid);
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.wms.biz.func.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailVo">
+		SELECT * FROM warehouse_inventory_checkbill_detail <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.wms.biz.func.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailVo">
+		SELECT * FROM warehouse_inventory_checkbill_detail <where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="selByMainSid"
+            resultType="com.yxt.wms.biz.func.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDetailsVo">
+		SELECT
+				wicd.*,
+				wi.goodsSpuName,
+				wi.goodsSkuCode,
+				wi.goodsSkuOwnSpec,
+				wi.unit
+		FROM
+				warehouse_inventory_checkbill_detail wicd
+						LEFT JOIN warehouse_inventory wi
+						ON wicd.inventorySid = wi.`sid`
+		WHERE billSid = #{billSid}
+	</select>
+</mapper>

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(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailQuery.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailQuery <br/>
+ * Description: 库存盘点-明细 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库存盘点-明细 查询条件", description = "库存盘点-明细 查询条件")
+public class WarehouseInventoryCheckbillDetailQuery implements Query {
+
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierBank/BaseSupplierBankService.java → 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(供应商管理) <br/>
+ * Project: yxt-wms(仓储) <br/>
- * File: BaseSupplierBankService.java <br/>
+ * File: WmsInventoryCheckbillDetailService.java <br/>
- * Class: com.yxt.base.biz.basesupplierbank.BaseSupplierBankService <br/>
+ * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService <br/>
- * Description: 供应商开户行信息 业务逻辑. <br/>
+ * Description: 库存盘点-明细 业务逻辑. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-18 13:33:13 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Service
-public class BaseSupplierBankService extends MybatisBaseService<BaseSupplierBankMapper, BaseSupplierBank> {
+public class WarehouseInventoryCheckbillDetailService extends MybatisBaseService<WarehouseInventoryCheckbillDetailMapper, WarehouseInventoryCheckbillDetail> {
 
-	public PagerVo<BaseSupplierBankVo> listPageVo(PagerQuery<BaseSupplierBankQuery> pq) {
+	public PagerVo<WarehouseInventoryCheckbillDetailVo> listPageVo(PagerQuery<WarehouseInventoryCheckbillDetailQuery> pq) {
-		BaseSupplierBankQuery query = pq.getParams();
+		WarehouseInventoryCheckbillDetailQuery query = pq.getParams();
-		QueryWrapper<BaseSupplierBank> qw = new QueryWrapper<>();
+		QueryWrapper<WarehouseInventoryCheckbillDetail> qw = new QueryWrapper<>();
-		IPage<BaseSupplierBank> page = PagerUtil.queryToPage(pq);
+		IPage<WarehouseInventoryCheckbillDetail> page = PagerUtil.queryToPage(pq);
-		IPage<BaseSupplierBankVo> pagging = baseMapper.selectPageVo(page, qw);
+		IPage<WarehouseInventoryCheckbillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BaseSupplierBankVo> p = PagerUtil.pageToVo(pagging, null);
+		PagerVo<WarehouseInventoryCheckbillDetailVo> 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<BaseSupplierBank
 		this.updateByDto(dto);
 	}
 	
-	public void insertByDto(BaseSupplierBankDto dto){
+	public void insertByDto(WarehouseInventoryCheckbillDetailDto dto){
-		BaseSupplierBank entity = new BaseSupplierBank();
+		WarehouseInventoryCheckbillDetail entity = new WarehouseInventoryCheckbillDetail();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.insert(entity);
 	}
 	
-	public void updateByDto(BaseSupplierBankDto dto){
+	public void updateByDto(WarehouseInventoryCheckbillDetailDto dto){
           String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
         } 
-		BaseSupplierBank entity = fetchBySid(dtoSid);
+		WarehouseInventoryCheckbillDetail entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.updateById(entity);
 	}
 	
-	public BaseSupplierBankDetailsVo fetchDetailsVoBySid(String sid){
+	public WarehouseInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid){
-		BaseSupplierBank entity = fetchBySid(sid);
+		WarehouseInventoryCheckbillDetail entity = fetchBySid(sid);
-		BaseSupplierBankDetailsVo vo = new BaseSupplierBankDetailsVo();
+		WarehouseInventoryCheckbillDetailDetailsVo vo = new WarehouseInventoryCheckbillDetailDetailsVo();
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
 
-	public int deleteBySupplierSid(String supplierSid) {
+	public void delByMainSid(String dtoSid) {
-		return baseMapper.deleteBySupplierSid(supplierSid);
+		baseMapper.delByMainSid(dtoSid);
 	}
 
-	public List<BaseSupplierBankDetailsVo> selectBySupplierSid(String supplierSid) {
+	public List<WarehouseInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid) {
-		return baseMapper.selectBySupplierSid(supplierSid);
+		return baseMapper.selByMainSid(billSid);
 	}
 }

wms-biz/src/main/java/com/yxt/wms/biz/func/basesupplierinfo/BaseSupplierInfoChoice.java → 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(供应商管理) <br/>
+ * Project: yxt-wms(仓储) <br/>
- * File: BaseSupplierInfoVo.java <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
- * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
- * Description: 供应商信息 视图数据对象. <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
  * Copyright: Copyright (c) 2011 <br/>
  * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2024-03-18 13:33:13 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
  *
  * @author liupopo
  * @version 1.0
  * @since 1.0
  */
 @Data
-@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象")
+@ApiModel(value = "库存盘点-明细 视图数据对象", description = "库存盘点-明细 视图数据对象")
-public class BaseSupplierInfoChoice implements Vo {
+public class WarehouseInventoryCheckbillDetailVo implements Vo {
 
-    private String sid;
-    @ApiModelProperty("供应商名称")
-    private String supplierName;
 }

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;
+}

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<WarehouseOutBillDetailDto> detailsList = new ArrayList<>();
+}

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<WarehouseOutBillDetailDto> detailsList = new ArrayList<>();
+
+
+}

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;
+}

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;
+
+
+}

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<WarehouseOutBill> {
+    IPage<WarehouseOutBillVo> listPage(IPage<WarehouseOutBill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseOutBill> qw);
+
+    WarehouseOutBillDetailsVo details(String sid);
+
+    IPage<WarehouseOutBillInventoryVo> getInventoryList(IPage<WarehouseOutBill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseOutBill> qw);
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillMapper.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillMapper">
+    <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillVo">
+        select wob.sid,
+               wob.billNo,
+               DATE_FORMAT(wob.createTime, '%Y-%m-%d') as createTime,
+               wob.createByName,
+               wob.sourceBillNo,
+               wob.busTypeValue,
+               wob.billState
+        from wms_out_bill wob
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by wob.id desc
+    </select>
+
+    <select id="details" resultType="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillDetailsVo">
+        select wob.sid,
+               wob.createBySid,
+               wob.createByName,
+               DATE_FORMAT(wob.createTime, '%Y-%m-%d') as createTime,
+               wob.sourceBillNo,
+               wob.busTypeKey,
+               wob.busTypeValue,
+               wob.billState,
+               wob.remarks
+        from wms_out_bill wob
+        where sid = #{sid}
+    </select>
+
+    <select id="getInventoryList" resultType="com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillInventoryVo">
+        select wi.goodsID,
+        wi.goodSpuSid,
+        wi.goodsSpuName,
+        wi.goodsSkuTitle,
+        wi.goodsSkuCode,
+        wi.goodsSkuSid,
+        wi.goodsSkuOwnSpec,
+        wi.unit,
+        wi.warehouseSid,
+        wi.warehouseName,
+        wi.warehouseRackSid,
+        wi.warehouseRackCode,
+        wi.count,
+        wi.sid inventorySid,
+        g.price
+        from wms_inventory wi
+        LEFT JOIN yxt_sms.sms_goods as g ON wi.goodsID = g.goodsID
+        <where>
+            ${ew.sqlSegment}
+        </where>
+        order by wi.id desc
+    </select>
+</mapper>

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;
+}

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<WarehouseOutBillMapper, WarehouseOutBill> {
+
+    @Autowired
+    private WarehouseOutBillFeign warehouseOutBillFeign;
+
+
+    public ResultBean<PagerVo<WarehouseOutBillVo>> listPage(PagerQuery<WarehouseOutBillQuery> pagerQuery) {
+        return warehouseOutBillFeign.pageList(pagerQuery);
+    }
+
+    public ResultBean<String> saveOrUpdateOutBill(WarehouseOutBillDto dto) {
+        return warehouseOutBillFeign.saveOrUpdateOutBill(dto);
+    }
+
+    public ResultBean<WarehouseOutBillDetailsVo> details(String sid) {
+        return warehouseOutBillFeign.details(sid);
+    }
+
+    public ResultBean<PagerVo<WarehouseOutBillInventoryVo>> getInventoryList(PagerQuery<WarehouseOutBillInventoryQuery> pagerQuery) {
+        WarehouseOutBillInventoryQuery query = pagerQuery.getParams();
+        PagerVo<WarehouseOutBillInventoryVo> pagerVo=warehouseOutBillFeign.getInventoryList(pagerQuery).getData();
+//        if (StringUtils.isNotBlank(query.getBusrepairBillsid())) {
+//            List<WarehouseOutBillInventoryVo> 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<PagerVo<WarehouseOutBillInventoryVo>>().success().setData(pagerVo);
+    }
+
+    public ResultBean confirm(WarehouseOutBillDto dto) {
+        return warehouseOutBillFeign.confirm(dto);
+    }
+
+}

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;
+
+
+}

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;
+
+
+}

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;
+
+
+}

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<WarehouseOutBillDetail> {
+    int deleteByMainSid(String sid);
+
+    List<WarehouseOutBillDetailDto> selectDetailsList(String sid);
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailMapper">
+    <delete id="deleteByMainSid">
+        delete
+        from wms_out_bill_detail
+        where billSid = #{sid}
+    </delete>
+
+    <select id="selectDetailsList" resultType="com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailDto">
+        select wbd.goodSpuSid,
+               wbd.goodsSpuName,
+               wbd.goodsSkuSid,
+               wbd.goodsSkuTitle,
+               wbd.goodsSkuCode,
+               wbd.goodsSkuOwnSpec,
+               wbd.unit
+        from warehouse_out_bill_detail wbd
+        where wbd.billSid = #{sid}
+    </select>
+</mapper>

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<WarehouseOutBillDetailMapper, WarehouseOutBillDetail> {
+    public void saveOrUpdateBillDetails(String sid, List<WarehouseOutBillDetailDto> 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<WarehouseOutBillDetailDto> selectDetailsList(String sid) {
+        return baseMapper.selectDetailsList(sid);
+    }
+}

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<WarehouseRack> page;
+    private String orgLevelKey;//
-    private QueryWrapper<WarehouseRack>qw;
 }

wms-biz/src/main/java/com/yxt/wms/biz/func/warehouserack/WarehouseRackService.java

@@ -39,60 +39,14 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
     public ResultBean<PagerVo<WarehouseRackVo>> listPage(PagerQuery<WarehouseRackQuery> pq) {
         ResultBean rb = ResultBean.fireFail();
         WarehouseRackQuery query = pq.getParams();
-        QueryWrapper<WarehouseRack> qw = new QueryWrapper<>();
         PrivilegeQuery privilegeQuery = new PrivilegeQuery();
         privilegeQuery.setOrgPath(query.getOrgPath());
         privilegeQuery.setMenuUrl(query.getMenuUrl());
         privilegeQuery.setUserSid(query.getUserSid());
         ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
-        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+        pq.getParams().setOrgLevelKey(defaultIdReltBean.getData());
-            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+
-            String orgSidPath = query.getOrgPath();
+        IPage<WarehouseRackVo> pagging = warehouseRackFeign.listPage(pq).getData();
-            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<WarehouseRackVo> p = new PagerVo<>();
-                return rb.success().setData(p);
-            }
-        } else {
-            PagerVo<WarehouseRackVo> 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<WarehouseRack> page = PagerUtil.queryToPage(pq);
-        query.setPage(page);
-        query.setQw(qw);
-        IPage<WarehouseRackVo> pagging = warehouseRackFeign.listPage(query).getData();
         PagerVo<WarehouseRackVo> p = PagerUtil.pageToVo(pagging, null);
         List<WarehouseRackVo> records = pagging.getRecords();
         return rb.success().setData(p);

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;//库存数量
+}

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;
+
+}

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;
+
+}

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;
+}

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;
+
+}

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;
+}

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;
+}

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;
+}

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;
+
+
+}

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;
+}

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;
+}

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;
+}

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;
+
+}

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;
+}

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;
+}

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<WarehouseInventory> {
+    IPage<WarehouseInventoryVo> listPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    WarehouseInventoryVo initialization(@Param("sid") String sid);
+
+    int updatePrice1(@Param("price") String price, @Param("list") List<String> stringList);
+
+    int updatePrice2(@Param("price") String price, @Param("list") List<String> stringList);
+
+    int updatePrice3(@Param("price") String price, @Param("list") List<String> stringList);
+
+    int updatePrice4(@Param("price") String price, @Param("list") List<String> stringList);
+
+    int updatePrice5(@Param("price") String price, @Param("list") List<String> stringList);
+
+    IPage<WarehouseInventoryBillListVo> getBillList(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw, @Param("sid") String sid);
+
+    List<WarehouseInventoryVoExcelVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryVoExcelVo> qw);
+
+    IPage<WarehouseInventorySalesVo> listPageSales(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    IPage<WarehouseInventoryPackageVo> getPackageGoodsVo(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    IPage<WarehouseInventoryAgeVo> inventoryAgeList(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    List<WarehouseInventoryAgeExportVo> ageExportExcel(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    WarehouseGoodsInventoryVo selectInvenBySkuSid(String skuSid);
+
+    IPage<WarehouseInventoryInvenSelectList> invenGoodsListPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    IPage<WarehouseInventoryAlloSelectList> alloGoodsListPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    IPage<WarehouseInventoryReturnSelectList> returnGoodsListPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+
+    IPage<WarehouseInventoryHandleSelectList> handleGoodsListPage(IPage<WarehouseInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventory> qw);
+}

wms-biz/src/main/java/com/yxt/wms/biz/func/warehousesinventory/WarehouseInventoryMapper.xml

@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="listPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo">
+        select a.goodsID,
+        a.sid,
+        a.goodsSpuName,
+        a.goodsSkuCode,
+        a.goodsSkuOwnSpec,
+        a.unit,
+        a.warehouseName,
+        a.warehouseRackCode,
+        a.count,
+        a.allocateCount,
+        a.batchNumber,
+        DATE_FORMAT(a.firstInDate, '%Y-%m-%d') as firstInDate
+        from wms_inventory a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="initialization" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVo">
+        select a.*,
+               b.goodsName as goodsName
+        from wms_inventory a
+                 left join wms_goods b on b.sid = a.goodsSid
+        where a.sid = #{sid}
+    </select>
+
+    <update id="updatePrice1">
+        update wms_inventory
+        set price1 = #{price} where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updatePrice2">
+        update wms_inventory
+        set price2 = #{price} where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updatePrice3">
+        update wms_inventory
+        set price3 = #{price} where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updatePrice4">
+        update wms_inventory
+        set price4 = #{price} where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <update id="updatePrice5">
+        update wms_inventory
+        set price5 = #{price} where sid in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </update>
+
+    <select id="getBillList" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillListVo">
+        select *
+        from (select wd.goodsSpuName,
+        wd.goodsSkuTitle,
+        wd.goodsSkuCode,
+        wd.goodsSkuOwnSpec,
+        wd.unit,
+        wd.warehouseName,
+        wd.warehouseArea,
+        wd.warehouseRackName,
+        wb.busTypeValue,
+        wd.cost,
+        wd.price1,
+        wd.price2,
+        wd.subject,
+        wb.createByName,
+        DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime,
+        wb.billNo,
+        wb.sourceBillSid sourceBillNo,
+        wb.billObjName,
+        wb.busTypeKey
+        from wms_inventory a
+        left join wms_inventory_bill wb on wb.sid = a.billSid
+        left join wms_inventory_bill_detail wd on wd.sid = a.billDetailSid
+        where a.sid = #{sid}
+        union all
+        select wd.goodsSpuName,
+        wd.goodsSkuTitle,
+        wd.goodsSkuCode,
+        wd.goodsSkuOwnSpec,
+        wd.unit,
+        wd.warehouseName,
+        wd.warehouseArea,
+        wd.warehouseRackName,
+        wb.busTypeValue,
+        wd.cost,
+        wd.price1,
+        wd.price2,
+        wd.subject,
+        wb.createByName,
+        DATE_FORMAT(wb.createTime, '%Y-%m-%d') as createTime,
+        wb.billNo,
+        wb.sourceBillSid sourceBillNo,
+        wb.billObjName,
+        wb.busTypeKey
+        from wms_inventory_bill_detail wd
+        left join wms_inventory_bill wb on wb.sid = wd.billSid
+        where wd.inventorySid = #{sid}) b
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="listExcel" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo">
+        select a.*,
+        (@rank := @rank + 1) rankNo
+        from (SELECT @rank := 0) t,
+        wms_inventory a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="listPageSales" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySalesVo">
+        SELECT i.sid AS inventorySid,
+        i.goodsID,
+        i.goodSpuSid,
+        i.goodsSpuName,
+        i.goodsSkuSid,
+        i.goodsSkuTitle,
+        i.goodsSkuCode,
+        i.unit,
+        i.warehouseSid,
+        i.warehouseName AS warehouse,
+        i.count as currentCount,
+        i.minimumPrice as price
+        FROM wms_inventory AS i
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="getPackageGoodsVo" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryPackageVo">
+        SELECT v.goodSpuSid goodsSid,
+        v.goodsSpuName goodsName,
+        v.goodsSkuCode goodsCode,
+        v.unit,
+        v.goodsSkuOwnSpec specification,
+        v.count,
+        v.minimumPrice price,
+        v.warehouseName warehouse,
+        v.warehouseSid,
+        v.warehouseArea,
+        v.remarks,
+        v.freePrice
+        FROM wms_inventory AS v
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="inventoryAgeList" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAgeVo">
+        SELECT sid,
+        goodsSpuName,
+        goodsSkuTitle,
+        goodsSkuCode,
+        goodsSkuOwnSpec,
+        unit,
+        warehouseName,
+        warehouseRackCode,
+        count,
+        date_format (w.firstInDate,'%Y-%m-%d') as firstInDate,
+        useOrgSid,
+        DATEDIFF(NOW(), firstInDate) age
+        FROM wms_inventory as w
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+    <select id="ageExportExcel" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAgeExportVo">
+        SELECT
+        ( @rank := @rank + 1 ) rankNo,
+        w.sid,
+        w.goodsSpuName,
+        w.goodsSkuTitle,
+        w.goodsSkuCode,
+        w.goodsSkuOwnSpec,
+        w.unit,
+        w.warehouseName,
+        w.warehouseRackCode,
+        w.count,
+        date_format (w.firstInDate,'%Y-%m-%d') as firstInDate,
+        DATEDIFF(NOW(), w.firstInDate) as age
+        FROM wms_inventory as w,
+        ( SELECT @rank := 0 ) t
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectInvenBySkuSid" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsGoodsInventoryVo">
+        SELECT goodsSkuOwnSpec,
+               warehouseSid,
+               warehouseName,
+               warehouseRackName,
+               COUNT
+        FROM wms_inventory
+        WHERE goodsSkuSid = #{skuSid}
+    </select>
+
+    <select id="invenGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryInvenSelectList">
+        SELECT wi.sid,
+        wi.goodsSpuName,
+        wi.goodsSkuCode,
+        wi.goodsSkuOwnSpec,
+        wi.unit,
+        wi.warehouseSid,
+        wi.warehouseName,
+        wi.warehouseRackSid,
+        wi.warehouseRackCode,
+        wwa.areaName,
+        wi.count
+        FROM wms_inventory wi
+        LEFT JOIN wms_warehouse_area wwa
+        ON wi.`warehouseRackSid` = wwa.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="alloGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryAlloSelectList">
+        SELECT wi.sid,
+        wi.goodsSpuName,
+        wi.goodsSkuCode,
+        wi.goodsSkuOwnSpec,
+        wi.unit,
+        wi.warehouseSid,
+        wi.warehouseName,
+        wi.warehouseRackSid,
+        wi.warehouseRackCode,
+        wwa.areaName,
+        wi.count
+        FROM wms_inventory wi
+        LEFT JOIN wms_warehouse_area wwa
+        ON wi.`warehouseRackSid` = wwa.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="returnGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryReturnSelectList">
+        SELECT
+        wi.goodsSpuName,
+        wi.goodsSkuCode,
+        wi.goodsSkuOwnSpec,
+        wi.unit
+        FROM
+        wms_inventory wi
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="handleGoodsListPage" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryHandleSelectList">
+        SELECT
+        wi.goodsID,
+        wi.goodsSpuName,
+        wi.goodsSkuCode,
+        wi.goodsSkuOwnSpec,
+        wi.unit,
+        wi.warehouseSid,
+        wi.warehouseName,
+        wi.warehouseRackSid,
+        wi.warehouseRackCode,
+        wi.count,
+        wb.supplierName
+        FROM wms_inventory wi
+        LEFT JOIN wms_inventory_batch wb
+        ON wi.sid = wb.inventorySid
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>