From ee978a81dcd4164884d349aec104d0689eb98329 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 25 Nov 2024 18:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=8C=E5=96=84=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBillSettelApplyDetailsVo.java | 7 ++++++- .../AsBillSettelApplyService.java | 3 +++ .../AsBusrepairBillService.java | 12 +++++------ .../apiadmin/base/WmsWarehouseInfoRest.java | 21 ++++++++++++++----- .../WmsWarehouseInfoMapper.java | 3 +++ .../WmsWarehouseInfoQuery.java | 1 + .../WmsWarehouseInfoService.java | 7 +++++++ .../WmsWarehouseZoneInitVo.java | 3 +-- .../WmsWarehouseZoneMapper.xml | 5 +++-- .../WmsWarehouseZoneQuery.java | 1 + .../WmsWarehouseZoneService.java | 3 +++ .../wmswarehousezone/WmsWarehouseZoneVo.java | 1 + 12 files changed, 51 insertions(+), 16 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java index 3055c79317..64c8628c48 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbillsettelapply/AsBillSettelApplyDetailsVo.java @@ -240,5 +240,10 @@ public class AsBillSettelApplyDetailsVo implements Vo { private String waitorName; private String procInsId; - + private String outCost; //外出成本 + private String outPrint; //外出利润额 + private String subsidyCost; //厂家补助成本 + private String subsidyPrint; //厂家补助利润额 + private String rescueCost; //施救费成本 + private String rescuePrint; //施救费利润额 } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java index 3dc52c89d9..5b347cb023 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbillsettelapply/AsBillSettelApplyService.java @@ -284,6 +284,9 @@ public class AsBillSettelApplyService extends MybatisBaseService> listPage(@RequestBody PagerQuery pq) { return wmsWarehouseService.listPage(pq); } + @ApiOperation("查询所有的仓库") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody OrgPathQuery query) { @@ -56,20 +57,21 @@ public class WmsWarehouseInfoRest { @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ + public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); wmsWarehouseService.delAll(sids); return rb.success(); } + @ApiOperation("更改可用状态") @GetMapping("/updateStatus/{sid}/{state}") - public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("state")String state) { - return wmsWarehouseService.updateIsEnable(sid,state); + public ResultBean updateIsEnable(@PathVariable("sid") String sid, @PathVariable("state") String state) { + return wmsWarehouseService.updateIsEnable(sid, state); } @ApiOperation("查询所有仓库") @GetMapping("/selectAll") - public ResultBean> selectAll(){ + public ResultBean> selectAll() { ResultBean rb = ResultBean.fireFail(); List wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll(); return rb.success().setData(wmsWarehouseAreaAllVos); @@ -78,9 +80,18 @@ public class WmsWarehouseInfoRest { @ApiOperation("查询仓库管理员") @GetMapping("/selMangerByRole") - public ResultBean> selMangerByRole(@RequestParam("useOrgSid") String useOrgSid){ + public ResultBean> selMangerByRole(@RequestParam("useOrgSid") String useOrgSid) { ResultBean rb = ResultBean.fireFail(); List vos = wmsWarehouseService.selMangerByRole(useOrgSid); return rb.success().setData(vos); } + + + @ApiOperation("根据仓库类型查询所有仓库") + @GetMapping("/selectWarehouseByType") + public ResultBean> selectWarehouseByType(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseTypeValue") String warehouseTypeValue) { + ResultBean rb = ResultBean.fireFail(); + List wmsWarehouseInfoAllVos = wmsWarehouseService.selectWarehouseByType(useOrgSid, warehouseTypeValue); + return rb.success().setData(wmsWarehouseInfoAllVos); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java index 20519ccfdd..40d5bb544e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoMapper.java @@ -33,4 +33,7 @@ public interface WmsWarehouseInfoMapper extends BaseMapper { List listAll(@Param("useOrgSid") String useOrgSid); int selectNum(@Param("billCode") String billCode); + + @Select("select sid,warehouseName from wms_warehouse_info where useOrgSid =#{useOrgSid} and isDelete = 0 and usageStatus = '1' and warehouseTypeValue =#{warehouseTypeValue}") + List selectWarehouseByType(@Param("useOrgSid")String useOrgSid, @Param("warehouseTypeValue")String warehouseTypeValue); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java index 1e86e328f2..73078ad5b0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoQuery.java @@ -13,6 +13,7 @@ public class WmsWarehouseInfoQuery implements Query { private String name; private String code; private String address; + private String warehouseTypeValue; @ApiModelProperty("菜单路由") private String menuUrl; @ApiModelProperty("组织全路径sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java index 97b99a0677..d6cdfa700f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehouseinfo/WmsWarehouseInfoService.java @@ -102,6 +102,9 @@ public class WmsWarehouseInfoService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); @@ -263,4 +266,8 @@ public class WmsWarehouseInfoService extends MybatisBaseService selectWarehouseByType(String useOrgSid, String warehouseTypeValue) { + return baseMapper.selectWarehouseByType(useOrgSid,warehouseTypeValue); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneInitVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneInitVo.java index eb03e2b76e..642bc6ef9a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneInitVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneInitVo.java @@ -19,6 +19,5 @@ public class WmsWarehouseZoneInitVo { private String volume;//区域面积 private String unit;//计量单位 private String userSid; //用户sid - - + private String warehouseTypeValue;//仓库类型 } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml index cbc8b1ad17..e72671165d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneMapper.xml @@ -15,7 +15,7 @@ select a.*, a.createBySid as userSid, - b.warehouseName as warehouseName + b.warehouseName as warehouseName, + b.warehouseTypeValue from wms_warehouse_zone a left join wms_warehouse_info b on b.sid = a.warehouseSid where a.sid = #{sid} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java index ac9737ffd7..4d7567262c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneQuery.java @@ -15,6 +15,7 @@ public class WmsWarehouseZoneQuery implements Query { private String name;//名字 private String code;//编码 private String warehouseSid;//仓库 + private String warehouseTypeValue;//仓库 @ApiModelProperty("菜单路由") private String menuUrl; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java index 4b930a0500..d0b8cff7b9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneService.java @@ -89,6 +89,9 @@ public class WmsWarehouseZoneService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java index 85432826f7..3d2d5db966 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/base/wmswarehousezone/WmsWarehouseZoneVo.java @@ -23,4 +23,5 @@ public class WmsWarehouseZoneVo implements Vo { private String volume;//区域面积 private String unit;//计量单位 private String warehouseName;//仓库名称 + private String warehouseTypeValue;//仓库类型 }