From 7a9c96c5cb51e9c297764790db5e6a4e9d9b7f38 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 13 Aug 2024 14:14:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=8A=A5=E4=BB=B7?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E8=BD=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basevehicleout/BaseVehicleOutService.java | 2 +- .../BusDeliveredApplyDetailsFeign.java | 4 ++-- .../BusDeliveredApplyDetailsFeignFallback.java | 2 +- .../BusDeliveredApplyDetailsMapper.java | 2 +- .../BusDeliveredApplyDetailsMapper.xml | 3 ++- .../BusDeliveredApplyDetailsRest.java | 4 ++-- .../BusDeliveredApplyDetailsService.java | 4 ++-- 7 files changed, 11 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java index 16d8db60e6..d95231e91a 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java @@ -2232,7 +2232,7 @@ public class BaseVehicleOutService extends MybatisBaseService> selectByApplySid(@RequestParam("sid") String sid); @ApiOperation("查询出库申请单sid") - @PostMapping("/fetchByVehSid") + @PostMapping("/fetchByVehSidAndContractNo") @ResponseBody - ResultBean fetchByVehSid(@RequestParam("vinSid") String vinSid); + ResultBean fetchByVehSidAndContractNo(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java index 1c8e14f664..9bb74e738f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java @@ -76,7 +76,7 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD } @Override - public ResultBean fetchByVehSid(String vinSid) { + public ResultBean fetchByVehSidAndContractNo(String vinSid, String contractNo) { return null; } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java index 6d7ccbebbe..73b2d4f6f0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java @@ -96,7 +96,7 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper selectVinSidByApplySid(String sid); - String fetchByVehSid(String vinSid); + String fetchByVehSidAndContractNo(@Param("vinSid") String vinSid,@Param("contractNo") String contractNo); int fetchByIsDeleteVinSid(String vinSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml index a683f37f17..be7936ef90 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml @@ -77,12 +77,13 @@ and bo.contractNo = ba.contractNo - SELECT ba.sid FROM bus_delivered_apply ba JOIN bus_delivered_apply_details bd ON ba.sid = bd.applySid WHERE bd.vinSid = #{vinSid} + AND ba.contractNo = #{contractNo} AND ba.nodeState = '已办结' diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java index 921fc411dc..5d25c51c52 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java @@ -99,7 +99,7 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei } @Override - public ResultBean fetchByVehSid(String vinSid) { - return busDeliveredApplyDetailsService.fetchByVehSid(vinSid); + public ResultBean fetchByVehSidAndContractNo(String vinSid,String contractNo) { + return busDeliveredApplyDetailsService.fetchByVehSidAndContractNo(vinSid,contractNo); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java index f0e92660ed..41d8f3c161 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java @@ -217,9 +217,9 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService fetchByVehSid(String vinSid) { + public ResultBean fetchByVehSidAndContractNo(String vinSid,String contractNo) { ResultBean rb = ResultBean.fireFail(); - String ckSid = baseMapper.fetchByVehSid(vinSid); + String ckSid = baseMapper.fetchByVehSidAndContractNo(vinSid,contractNo); return rb.success().setData(ckSid); } From 5c120ada3e338ff69a2546ff45a23feb49c4c8be Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 13 Aug 2024 14:23:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=9B=98?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventorycheckbill/HandleBean.java | 44 +++++++++ .../WmsInventoryCheckbillFeign.java | 47 +++++++++ .../WmsInventoryCheckbillGoodsDto.java | 32 +++++++ .../WmsInventoryCheckbillGoodsPageQuery.java | 18 ++++ .../WmsInventoryCheckbillGoodsPageVo.java | 18 ++++ .../WmsInventoryCheckbillPageQuery.java | 20 ++++ .../WmsInventoryCheckbillPageVo.java | 30 ++++++ .../WmsInventoryCheckbillRest.java | 59 ++++++++++++ .../WmsInventoryCheckbillService.java | 94 ++++++++++++++++++ .../WmsInventoryCheckbillDetailFile.java | 35 +++++++ ...yCheckbillDetailRackGoodPageListQuery.java | 63 ++++++++++++ ...toryCheckbillDetailRackGoodPageListVo.java | 95 +++++++++++++++++++ .../WmsInventoryCheckbillFeign.java | 43 +++++++++ .../inventroy/WmsInventoryCheckbillRest.java | 24 ++++- .../WmsInventoryCheckbillMapper.java | 3 + .../WmsInventoryCheckbillMapper.xml | 25 +++++ .../WmsInventoryCheckbillService.java | 66 +++++++++++++ ...nventoryCheckbillDetailGoodPageListVo.java | 3 +- .../WmsInventoryCheckbillDetailMapper.java | 8 ++ .../WmsInventoryCheckbillDetailMapper.xml | 12 +++ ...yCheckbillDetailRackGoodPageListQuery.java | 5 + ...toryCheckbillDetailRackGoodPageListVo.java | 3 +- ...ntoryCheckbillDetailRackPageListQuery.java | 8 ++ .../WmsInventoryCheckbillDetailService.java | 15 +++ .../app/WmsInventoryCheckbillGoodsDto.java | 35 +++++++ .../app/WmsInventoryCheckbillPageQuery.java | 19 ++++ .../app/WmsInventoryCheckbillPageVo.java | 30 ++++++ 27 files changed, 851 insertions(+), 3 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/HandleBean.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailFile.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsDto.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageQuery.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageVo.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/HandleBean.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/HandleBean.java new file mode 100644 index 0000000000..cff60798d5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/HandleBean.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.terminal.api.wms.inventorycheckbill; + +import lombok.Data; + +import java.util.List; + +@Data +public class HandleBean { + + /** + * 损坏数量，默认 0 + */ + private String badNum; + private List files; + /** + * 商品ID + */ + private String goodsID; + /** + * 商品名称 + */ + private String goodsName; + /** + * 图号 + */ + private String goodsSkuCode; + /** + * 本库位库存 + */ + private String lockNum; + /** + * 确认数量/数量，赋值为库存数量 + */ + private String num; + private String remarks; + /** + * 商品记录sid + */ + private String sid; + /** + * 单位 + */ + private String unit; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java new file mode 100644 index 0000000000..590caf0788 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.wms.inventorycheckbill; + + +import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.OtherDataDto; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealTaskQuery; +import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.SubmitHomeAppealApplyDto; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +/** + * @Author + * @Date + * @Description + */ +@Api(tags = "售后盘点") +@FeignClient( + contextId = "terminal-WmsInventoryCheckbill", + name = "anrui-terminal", + path = "v1/inventory") +public interface WmsInventoryCheckbillFeign { + + @ApiOperation("盘点列表") + @PostMapping("/list") + @ResponseBody + ResultBean> list(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("盘点-库位商品列表") + @PostMapping("/fetchByKuWeiSid") + @ResponseBody + ResultBean> fetchByKuWeiSid(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("办理/扫码保存") + @PostMapping("/saveInventoryInfo") + @ResponseBody + ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java new file mode 100644 index 0000000000..1bd3ab7440 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.terminal.api.wms.inventorycheckbill; + +import com.yxt.common.core.dto.Dto; +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +import java.util.List; + +@Data +public class WmsInventoryCheckbillGoodsDto implements Dto { + + /** + * 损坏数量 + */ + private String badNum; + /** + * 附件 + */ + private List files; + /** + * 确认数量/数量 + */ + private String num; + /** + * 备注 + */ + private String remarks; + /** + * 商品记录sid + */ + private String sid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java new file mode 100644 index 0000000000..897a5cb305 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.wms.inventorycheckbill; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillGoodsPageQuery implements Query { + + /** + * 盘点单sid + */ + private String sid; + /** + * 库位sid + */ + private String houseSid; + private String names; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageVo.java new file mode 100644 index 0000000000..48c4aba92f --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageVo.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.api.wms.inventorycheckbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillGoodsPageVo implements Vo { + + /** + * 点击办理时需要的数据 + */ + private HandleBean handleBean; + private String kuCun; + private String panSun; + private String shiPan; + private String yingKui; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java new file mode 100644 index 0000000000..00fa416c62 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java @@ -0,0 +1,20 @@ +package com.yxt.anrui.terminal.api.wms.inventorycheckbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillPageQuery implements Query { + + private String menuSid; + /** + * 仓库/库区/库位 + */ + private String names; + /** + * 组织机构sid + */ + private String orgPath; + private String userSid; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageVo.java new file mode 100644 index 0000000000..1a170e3508 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.terminal.api.wms.inventorycheckbill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillPageVo implements Vo { + + @ApiModelProperty("盘点单sid") + private String sid; + @ApiModelProperty("库位sid") + private String houseSid; + @ApiModelProperty("仓库-库区-库位") + private String title; + @ApiModelProperty("应盘数量") + private String totalNumber; + @ApiModelProperty("未盘数量") + private String surplusNumber; + @ApiModelProperty("盘亏数量") + private String lossNumber; + @ApiModelProperty("盘损数量") + private String damageNumber; + @ApiModelProperty("盘盈数量") + private String profitNumber; + @ApiModelProperty("实盘数量") + private String actualNumber; + @ApiModelProperty("是否显示按钮") + private Boolean showBtn = true; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java new file mode 100644 index 0000000000..4909a3587b --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java @@ -0,0 +1,59 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.wms.inventorycheckbill; + +import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.OtherDataDto; +import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@Api(tags = "售后盘点") +@RestController +@RequestMapping("v1/inventory") +public class WmsInventoryCheckbillRest implements WmsInventoryCheckbillFeign { + + @Autowired + private WmsInventoryCheckbillService wmsInventoryCheckbillService; + + @Override + public ResultBean> list(PagerQuery pagerQuery) { + return wmsInventoryCheckbillService.pdlist(pagerQuery); + } + + @Override + public ResultBean> fetchByKuWeiSid(PagerQuery pagerQuery) { + return wmsInventoryCheckbillService.fetchByKuWeiSid(pagerQuery); + } + + @Override + public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { + return wmsInventoryCheckbillService.saveInventoryInfo(dto); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java new file mode 100644 index 0000000000..f4a6cfb2eb --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.wms.inventorycheckbill; + +import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*; +import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailFile; +import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListQuery; +import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListVo; +import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillFeign; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@Service +public class WmsInventoryCheckbillService { + + @Resource + private WmsInventoryCheckbillFeign wmsInventoryCheckbillFeign; + + public ResultBean> pdlist(PagerQuery pagerQuery) { + return wmsInventoryCheckbillFeign.appDetailRackPageList(pagerQuery); + } + + public ResultBean> fetchByKuWeiSid(PagerQuery pagerQuery) { + ResultBean rb = ResultBean.fireFail(); + PagerQuery query = new PagerQuery<>(); + WmsInventoryCheckbillDetailRackGoodPageListQuery wmsInventoryCheckbillDetailRackGoodPageListQuery = new WmsInventoryCheckbillDetailRackGoodPageListQuery(); + WmsInventoryCheckbillGoodsPageQuery params = pagerQuery.getParams(); + wmsInventoryCheckbillDetailRackGoodPageListQuery.setBillSid(params.getSid()); + wmsInventoryCheckbillDetailRackGoodPageListQuery.setWarehouseRackSid(params.getHouseSid()); + wmsInventoryCheckbillDetailRackGoodPageListQuery.setNames(params.getNames()); + query.setParams(wmsInventoryCheckbillDetailRackGoodPageListQuery); + PagerVo data = wmsInventoryCheckbillFeign.detailRackGoodPageList(query).getData(); + PagerVo wmsInventoryCheckbillGoodsPageVoPagerVo = new PagerVo<>(); + for (WmsInventoryCheckbillDetailRackGoodPageListVo record : data.getRecords()) { + WmsInventoryCheckbillGoodsPageVo wmsInventoryCheckbillGoodsPageVo = new WmsInventoryCheckbillGoodsPageVo(); + wmsInventoryCheckbillGoodsPageVo.setKuCun(record.getBookCount().toString()); + wmsInventoryCheckbillGoodsPageVo.setShiPan(record.getRealCount().toString()); + wmsInventoryCheckbillGoodsPageVo.setYingKui(record.getProfitAndLoseCount().toString()); + wmsInventoryCheckbillGoodsPageVo.setPanSun(record.getLossCount().toString()); + HandleBean handleBean = new HandleBean(); + handleBean.setBadNum(record.getLossCount().toString()); + List fileList = record.getFileList(); + List files = new ArrayList<>(); + for (WmsInventoryCheckbillDetailFile wmsInventoryCheckbillDetailFile : fileList) { + files.add(wmsInventoryCheckbillDetailFile.getUrl()); + } + handleBean.setFiles(files); + handleBean.setGoodsID(record.getGoodsID()); + handleBean.setGoodsName(record.getGoodsSkuTitle()); + handleBean.setGoodsSkuCode(record.getGoodsSkuCode()); + handleBean.setLockNum(record.getBookCount().toString()); + handleBean.setNum(record.getBookCount().toString()); + handleBean.setRemarks(record.getRemarks()); + handleBean.setSid(record.getSid()); + handleBean.setUnit(record.getUnit()); + wmsInventoryCheckbillGoodsPageVo.setHandleBean(handleBean); + wmsInventoryCheckbillGoodsPageVoPagerVo.getRecords().add(wmsInventoryCheckbillGoodsPageVo); + } + return rb.success().setData(wmsInventoryCheckbillGoodsPageVoPagerVo); + } + + public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { + return wmsInventoryCheckbillFeign.saveInventoryInfo(dto); + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailFile.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailFile.java new file mode 100644 index 0000000000..e749223e25 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailFile.java @@ -0,0 +1,35 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillDetailFile implements Vo { + + private String url; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java new file mode 100644 index 0000000000..0b3ef73f9b --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query { + + @ApiModelProperty("盘点sid") + private String billSid; + @ApiModelProperty("库位sid") + private String warehouseRackSid; // 库位sid + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + + private String names; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListVo.java new file mode 100644 index 0000000000..a3948e9743 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListVo.java @@ -0,0 +1,95 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: yxt-wms(仓储)
+ * File: WmsInventoryCheckbillDetailVo.java
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo
+ * Description: 库存盘点-明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-22 09:25:02
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情") +public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("商品ID") + private String goodsID; // 商品ID + @ApiModelProperty("商品名称") + private String goodsSkuTitle; // 商品名称 + @ApiModelProperty("图号") + private String goodsSkuCode; // 图号 + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库区名称") + private String warehouseArea; + @ApiModelProperty("库位名称") + private String warehouseRackName; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("成本单价") + private BigDecimal cost; + @ApiModelProperty("应盘数量") + private BigDecimal bookCount; + @ApiModelProperty("应盘金额") + private BigDecimal bookAmount; + @ApiModelProperty("实盘数量") + private BigDecimal realCount; + @ApiModelProperty("实盘金额") + private BigDecimal realAmount; + @ApiModelProperty("状态") + private String state; + @ApiModelProperty("盈亏数量") + private BigDecimal profitAndLoseCount; + @ApiModelProperty("盈亏金额") + private BigDecimal profitAndLoseAmount; + @ApiModelProperty("盘损数量") + private BigDecimal lossCount; + @ApiModelProperty("盘损金额") + private BigDecimal lossAmount; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("附件") + private List fileList = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java new file mode 100644 index 0000000000..a01d3d7c86 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill; + + +import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillGoodsDto; +import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillPageQuery; +import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillPageVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @Author + * @Date + * @Description + */ +@Api(tags = "售后盘点") +@FeignClient( + contextId = "yxt-wms-WmsInventoryCheckbill", + name = "yxt-wms", + path = "v1/wmsinventorycheckbill") +public interface WmsInventoryCheckbillFeign { + + @ApiOperation("app-盘点-查看库位盘点列表") + @PostMapping("/appDetailRackPageList") + public ResultBean> appDetailRackPageList(@RequestBody PagerQuery pq); + + + @ApiOperation("查看库位商品盘点列表") + @PostMapping("/detailRackGoodPageList") + public ResultBean> detailRackGoodPageList(@RequestBody PagerQuery pq); + + @ApiOperation("办理/扫码保存") + @PostMapping("/saveInventoryInfo") + @ResponseBody + ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto); +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index b117c0b7be..a89586fd34 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -32,6 +32,9 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportDetailsVo; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import io.swagger.annotations.Api; @@ -124,7 +127,7 @@ public class WmsInventoryCheckbillRest { return rb.success().setData(pv); } - @ApiOperation("查看库区商品盘点列表") + @ApiOperation("查看库位商品盘点列表") @PostMapping("/detailRackGoodPageList") public ResultBean> detailRackGoodPageList(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); @@ -132,6 +135,25 @@ public class WmsInventoryCheckbillRest { return rb.success().setData(pv); } + /*********************************************************移动端************************************************************/ + + @ApiOperation("app-盘点-查看库位盘点列表") + @PostMapping("/appDetailRackPageList") + public ResultBean> appDetailRackPageList(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.appDetailRackPageList(pq); + return rb.success().setData(pv); + } + + @ApiOperation("办理/扫码保存") + @PostMapping("/saveInventoryInfo") + @ResponseBody + ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto){ + return wmsInventoryCheckbillService.saveInventoryInfo(dto); + }; + + /*********************************************************流程************************************************************/ + @ApiOperation("提交") @PostMapping("/submitApply") public ResultBean submitApply(@Valid @RequestBody SubmitInventoryCheckDto dto) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java index 5101121d94..b9e601e301 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java @@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -80,4 +81,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper beanToMap); + + IPage appDetailRackPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 9bbc70bf4b..1936873004 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -215,4 +215,29 @@ WHERE sid=#{sid} + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 4d3fdd0404..585c998bbc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -43,6 +43,9 @@ import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import com.yxt.wms.feign.flowable.flow.FlowableFeign; @@ -255,6 +258,10 @@ public class WmsInventoryCheckbillService extends MybatisBaseService wrapper.like("goodsID", query.getNames()).or().like("goodsSkuTitle", query.getNames()).or().like("goodsSkuCode", query.getNames())); + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.detailRackGoodPageList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -761,4 +768,63 @@ public class WmsInventoryCheckbillService extends MybatisBaseService appDetailRackPageList(PagerQuery pq) { + WmsInventoryCheckbillPageQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //========================================数据授权开始 + if (StringUtils.isNotBlank(query.getMenuSid())) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuSid(query.getMenuSid()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("c.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } + if (StringUtils.isNotBlank(query.getNames())) { + qw.and(wrapper -> wrapper.like("d.warehouseName", query.getNames()).or().like("d.warehouseArea", query.getNames()).or().like("d.warehouseRackName", query.getNames())); + } + qw.eq("c.checkState",'1'); + qw.groupBy("d.warehouseRackSid"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.appDetailRackPageList(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { + ResultBean rb = ResultBean.fireFail(); + wmsInventoryCheckbillDetailService.saveInventoryInfo(dto); + return rb.success(); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java index ec2a0332d7..fefc14884b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -90,5 +91,5 @@ public class WmsInventoryCheckbillDetailGoodPageListVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("附件") - private List fileList; + private List fileList = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java index bddfdf7b54..31fee10ee1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java @@ -29,12 +29,14 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; 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.math.BigDecimal; import java.util.List; /** @@ -63,4 +65,10 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper reportSumWare(String billSid); List reportSumArea(String billSid); + + void saveInventoryInfoZC(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("num") String num); + + void saveInventoryInfoPY(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("pyCount") BigDecimal pyCount); + + void saveInventoryInfoPK(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("pkCount") BigDecimal pkCount); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml index 06b7c9ef72..93289ae495 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml @@ -78,4 +78,16 @@ WHERE wicd.billSid = #{billSid} GROUP BY wicd.warehouseAreaSid + + + update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = 0,remarks = #{dto.remarks} where sid = #{dto.sid} + + + + update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = #{pyCount},loseCount = 0,remarks = #{dto.remarks} where sid = #{dto.sid} + + + + update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = #{pkCount},remarks = #{dto.remarks} where sid = #{dto.sid} + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java index c4f23d6908..94081a39d9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java @@ -58,4 +58,9 @@ public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query { private String goodsSkuTitle; // 商品名称 @ApiModelProperty("图号") private String goodsSkuCode; // 图号 + + /* + * 移动端查询条件 + * */ + private String names; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java index 177d469761..218e30aaf0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -90,5 +91,5 @@ public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("附件") - private List fileList; + private List fileList = new ArrayList<>(); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java index 30ae8008d8..ba928830dd 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java @@ -58,4 +58,12 @@ public class WmsInventoryCheckbillDetailRackPageListQuery implements Query { private String warehouseAreaSid; // 库区sid @ApiModelProperty("库位sid") private String warehouseRackSid; // 库位sid + + /* + * 移动端查询条件 + * */ + private String userSid; + private String orgPath; + private String menuSid; + private String names; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java index 07ff51aeb1..76791b68fe 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java @@ -26,11 +26,13 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; import cn.hutool.core.bean.BeanUtil; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -83,4 +85,17 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService 0){//盘亏 + BigDecimal pkCount = new BigDecimal(dto.getLockNum()).subtract(new BigDecimal(dto.getNum())); + baseMapper.saveInventoryInfoPK(dto,pkCount); + }else { + baseMapper.saveInventoryInfoZC(dto,dto.getNum()); + } + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsDto.java new file mode 100644 index 0000000000..f82390ccda --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsDto.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.List; + +@Data +public class WmsInventoryCheckbillGoodsDto implements Dto { + + /** + * 损坏数量 + */ + private String badNum; + /** + * 附件 + */ + private List files; + /** + * 确认数量/数量 + */ + private String num; + /** + * 库存数量 + */ + private String lockNum; + /** + * 备注 + */ + private String remarks; + /** + * 商品记录sid + */ + private String sid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageQuery.java new file mode 100644 index 0000000000..58b6ef307b --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageQuery.java @@ -0,0 +1,19 @@ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillPageQuery implements Query { + + private String menuSid; + /** + * 仓库/库区/库位 + */ + private String names; + /** + * 组织机构sid + */ + private String orgPath; + private String userSid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageVo.java new file mode 100644 index 0000000000..98c2e2806f --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageVo.java @@ -0,0 +1,30 @@ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WmsInventoryCheckbillPageVo implements Vo { + + @ApiModelProperty("盘点单sid") + private String sid; + @ApiModelProperty("库位sid") + private String houseSid; + @ApiModelProperty("仓库-库区-库位") + private String title; + @ApiModelProperty("应盘数量") + private String totalNumber; + @ApiModelProperty("未盘数量") + private String surplusNumber; + @ApiModelProperty("盘亏数量") + private String lossNumber; + @ApiModelProperty("盘损数量") + private String damageNumber; + @ApiModelProperty("盘盈数量") + private String profitNumber; + @ApiModelProperty("实盘数量") + private String actualNumber; + @ApiModelProperty("是否显示按钮") + private Boolean showBtn = false; +} From b47e6664efdc8517d192e185c1a921c7b54a27af Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 13 Aug 2024 15:46:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=A0=81=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsInventoryCheckbillFeign.java | 5 + .../WmsInventoryCheckbillRest.java | 33 +- .../WmsInventoryCheckbillService.java | 4 + .../WmsInventoryCheckbillFeign.java | 11 +- .../inventroy/WmsInventoryCheckbillRest.java | 288 +++++++++--------- .../WmsInventoryCheckbillService.java | 30 ++ .../WmsInventoryCheckbillDetailMapper.java | 3 + .../WmsInventoryCheckbillDetailMapper.xml | 18 ++ .../WmsInventoryCheckbillDetailService.java | 91 +++--- .../app/HandleBean.java | 44 +++ .../WmsInventoryRecordMapper.java | 2 + .../WmsInventoryRecordMapper.xml | 9 + .../WmsInventoryRecordService.java | 4 + 13 files changed, 341 insertions(+), 201 deletions(-) create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/HandleBean.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java index 590caf0788..bad0a20081 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java @@ -44,4 +44,9 @@ public interface WmsInventoryCheckbillFeign { @PostMapping("/saveInventoryInfo") @ResponseBody ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto); + + @ApiOperation("扫描商品码") + @GetMapping("/scan") + @ResponseBody + public ResultBean scan(@RequestParam("sid") String sid,@RequestParam("content") String content,@RequestParam("houseSid") String houseSid); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java index 4909a3587b..91139a71a1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java @@ -39,21 +39,26 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("v1/inventory") public class WmsInventoryCheckbillRest implements WmsInventoryCheckbillFeign { - @Autowired - private WmsInventoryCheckbillService wmsInventoryCheckbillService; + @Autowired + private WmsInventoryCheckbillService wmsInventoryCheckbillService; - @Override - public ResultBean> list(PagerQuery pagerQuery) { - return wmsInventoryCheckbillService.pdlist(pagerQuery); - } + @Override + public ResultBean> list(PagerQuery pagerQuery) { + return wmsInventoryCheckbillService.pdlist(pagerQuery); + } - @Override - public ResultBean> fetchByKuWeiSid(PagerQuery pagerQuery) { - return wmsInventoryCheckbillService.fetchByKuWeiSid(pagerQuery); - } + @Override + public ResultBean> fetchByKuWeiSid(PagerQuery pagerQuery) { + return wmsInventoryCheckbillService.fetchByKuWeiSid(pagerQuery); + } - @Override - public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { - return wmsInventoryCheckbillService.saveInventoryInfo(dto); - } + @Override + public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { + return wmsInventoryCheckbillService.saveInventoryInfo(dto); + } + + @Override + public ResultBean scan(String sid, String content, String houseSid) { + return wmsInventoryCheckbillService.scan(sid, content, houseSid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java index f4a6cfb2eb..47f4f44dc1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java @@ -91,4 +91,8 @@ public class WmsInventoryCheckbillService { public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { return wmsInventoryCheckbillFeign.saveInventoryInfo(dto); } + + public ResultBean scan(String sid, String content, String houseSid) { + return wmsInventoryCheckbillFeign.scan(sid, content, houseSid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java index a01d3d7c86..4c8cab751e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill; +import com.yxt.anrui.terminal.api.wms.inventorycheckbill.HandleBean; import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillGoodsDto; import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillPageQuery; import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillPageVo; @@ -10,10 +11,7 @@ import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; /** * @Author @@ -40,4 +38,9 @@ public interface WmsInventoryCheckbillFeign { @PostMapping("/saveInventoryInfo") @ResponseBody ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto); + + @ApiOperation("扫描商品码") + @GetMapping("/scan") + @ResponseBody + public ResultBean scan(@RequestParam("sid") String sid, @RequestParam("content") String content, @RequestParam("houseSid") String houseSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index a89586fd34..c2d55ac94d 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -32,6 +32,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; @@ -64,145 +65,152 @@ import java.util.List; @RequestMapping("v1/wmsinventorycheckbill") public class WmsInventoryCheckbillRest { - @Autowired - private WmsInventoryCheckbillService wmsInventoryCheckbillService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新建盘点单") - @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){ - return wmsInventoryCheckbillService.saveOrUpdateDto(dto); - } - - @ApiOperation("生成盘点报告") - @PostMapping("/createReport") - public ResultBean createReport(@RequestParam("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - wmsInventoryCheckbillService.createReport(sid); - return rb.success(); - } - - @ApiOperation("查看盘点报告") - @PostMapping("/viewReport") - public ResultBean viewReport(@RequestParam("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = wmsInventoryCheckbillService.viewReport(sid); - return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo); - } - - @ApiOperation("生成盘点报告PDF") - @PostMapping("/createPdf") - public ResultBean createPdf(@RequestParam("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - String url = wmsInventoryCheckbillService.createPdf(sid); - return rb.success().success().setData(url); - } - - @ApiOperation("根据sid批量删除") + @Autowired + private WmsInventoryCheckbillService wmsInventoryCheckbillService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新建盘点单") + @PostMapping("/save") + public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto) { + return wmsInventoryCheckbillService.saveOrUpdateDto(dto); + } + + @ApiOperation("生成盘点报告") + @PostMapping("/createReport") + public ResultBean createReport(@RequestParam("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + wmsInventoryCheckbillService.createReport(sid); + return rb.success(); + } + + @ApiOperation("查看盘点报告") + @PostMapping("/viewReport") + public ResultBean viewReport(@RequestParam("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = wmsInventoryCheckbillService.viewReport(sid); + return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo); + } + + @ApiOperation("生成盘点报告PDF") + @PostMapping("/createPdf") + public ResultBean createPdf(@RequestParam("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + String url = wmsInventoryCheckbillService.createPdf(sid); + return rb.success().success().setData(url); + } + + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - return wmsInventoryCheckbillService.delAll(sids); - } - - @ApiOperation("盘点-查看库位盘点列表") - @PostMapping("/detailRackPageList") - public ResultBean> detailRackPageList(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillService.detailRackPageList(pq); - return rb.success().setData(pv); - } - - @ApiOperation("盘点-查看商品盘点列表") - @PostMapping("/detailGoodPageList") - public ResultBean> detailGoodPageList(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillService.detailGoodPageList(pq); - return rb.success().setData(pv); - } - - @ApiOperation("查看库位商品盘点列表") - @PostMapping("/detailRackGoodPageList") - public ResultBean> detailRackGoodPageList(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq); - return rb.success().setData(pv); - } - - /*********************************************************移动端************************************************************/ - - @ApiOperation("app-盘点-查看库位盘点列表") - @PostMapping("/appDetailRackPageList") - public ResultBean> appDetailRackPageList(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryCheckbillService.appDetailRackPageList(pq); - return rb.success().setData(pv); - } - - @ApiOperation("办理/扫码保存") - @PostMapping("/saveInventoryInfo") - @ResponseBody - ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto){ - return wmsInventoryCheckbillService.saveInventoryInfo(dto); - }; - - /*********************************************************流程************************************************************/ - - @ApiOperation("提交") - @PostMapping("/submitApply") - public ResultBean submitApply(@Valid @RequestBody SubmitInventoryCheckDto dto) { - return wmsInventoryCheckbillService.submitApply(dto); - } - - @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - public ResultBean complete(@Valid @RequestBody CompleteInventoryCheckDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(""); - return wmsInventoryCheckbillService.complete(bv); - } - - @ApiOperation(value = "获取上一个环节") - @GetMapping(value = "/getPreviousNodesForReject") - ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap InventoryCheckNodeQuery query) { - return wmsInventoryCheckbillService.getPreviousNodesForReject(query); - } - - @ApiOperation(value = "获取下一个环节") - @GetMapping(value = "/getNextNodesForSubmit") - ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap InventoryCheckNodeQuery query) { - return wmsInventoryCheckbillService.getNextNodesForSubmit(query); - } - - @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") - public ResultBean taskReject(@Valid @RequestBody InventoryCheckTaskQuery query) { - return wmsInventoryCheckbillService.taskReject(query); - } - - @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") - public ResultBean revokeProcess(@Valid @RequestBody InventoryCheckTaskQuery query) { - return wmsInventoryCheckbillService.revokeProcess(query); - } - - @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") - public ResultBean breakProcess(@Valid @RequestBody InventoryCheckTaskQuery query) { - return wmsInventoryCheckbillService.breakProcess(query); - } - - @ApiOperation(value = "加签") - @PostMapping(value = "/delegate") - @ResponseBody - public ResultBean delegate(@RequestBody InventoryCheckDelegateQuery query) { - return wmsInventoryCheckbillService.delegate(query); - } + public ResultBean delBySids(@RequestBody String[] sids) { + return wmsInventoryCheckbillService.delAll(sids); + } + + @ApiOperation("盘点-查看库位盘点列表") + @PostMapping("/detailRackPageList") + public ResultBean> detailRackPageList(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.detailRackPageList(pq); + return rb.success().setData(pv); + } + + @ApiOperation("盘点-查看商品盘点列表") + @PostMapping("/detailGoodPageList") + public ResultBean> detailGoodPageList(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.detailGoodPageList(pq); + return rb.success().setData(pv); + } + + @ApiOperation("查看库位商品盘点列表") + @PostMapping("/detailRackGoodPageList") + public ResultBean> detailRackGoodPageList(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq); + return rb.success().setData(pv); + } + + /*********************************************************移动端************************************************************/ + + @ApiOperation("app-盘点-查看库位盘点列表") + @PostMapping("/appDetailRackPageList") + public ResultBean> appDetailRackPageList(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryCheckbillService.appDetailRackPageList(pq); + return rb.success().setData(pv); + } + + @ApiOperation("办理/扫码保存") + @PostMapping("/saveInventoryInfo") + @ResponseBody + ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto) { + return wmsInventoryCheckbillService.saveInventoryInfo(dto); + } + + @ApiOperation("扫描商品码") + @GetMapping("/scan") + @ResponseBody + public ResultBean scan(@RequestParam("sid") String sid, @RequestParam("content") String content, @RequestParam("houseSid") String houseSid) { + return wmsInventoryCheckbillService.scan(sid, content, houseSid); + } + + /*********************************************************流程************************************************************/ + + @ApiOperation("提交") + @PostMapping("/submitApply") + public ResultBean submitApply(@Valid @RequestBody SubmitInventoryCheckDto dto) { + return wmsInventoryCheckbillService.submitApply(dto); + } + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteInventoryCheckDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(""); + return wmsInventoryCheckbillService.complete(bv); + } + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap InventoryCheckNodeQuery query) { + return wmsInventoryCheckbillService.getPreviousNodesForReject(query); + } + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap InventoryCheckNodeQuery query) { + return wmsInventoryCheckbillService.getNextNodesForSubmit(query); + } + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@Valid @RequestBody InventoryCheckTaskQuery query) { + return wmsInventoryCheckbillService.taskReject(query); + } + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody InventoryCheckTaskQuery query) { + return wmsInventoryCheckbillService.revokeProcess(query); + } + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody InventoryCheckTaskQuery query) { + return wmsInventoryCheckbillService.breakProcess(query); + } + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody InventoryCheckDelegateQuery query) { + return wmsInventoryCheckbillService.delegate(query); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 585c998bbc..1a02fae368 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -43,10 +43,12 @@ import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*; +import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import com.yxt.wms.feign.flowable.flow.FlowableFeign; import com.yxt.wms.feign.flowable.flow.ProcDefEnum; @@ -106,6 +108,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService scan(String sid, String content, String houseSid) { + ResultBean rb = ResultBean.fireFail(); + if (content.contains("#")){ + return rb.setMsg("请扫描商品码"); + } + HandleBean handleBean = wmsInventoryCheckbillDetailService.scan(sid,content,houseSid); + if (handleBean == null){ + List wmsInventories = wmsInventoryService.getListByGoodsID(content).getData(); + if (!wmsInventories.isEmpty()){ + for (WmsInventory wmsInventory : wmsInventories) { + WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsInventory.getWarehouseRackSid()); + WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid()); + return rb.setMsg("本商品不属于本库位，属于" + wmsWarehouseArea.getAreaName() + "库区" + wmsWarehouseRack.getRackName() + "库位。"); + } + }else { + String billNo = wmsInventoryRecordService.selByGoodsID(content); + if (StringUtils.isBlank(billNo)){ + return rb.setMsg("商品码不正确"); + }else { + return rb.setMsg("本商品已在" + billNo + "单据编号中出库。"); + } + } + } + return rb.success().setData(handleBean); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java index 31fee10ee1..7181b49a53 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; import org.apache.ibatis.annotations.Delete; @@ -71,4 +72,6 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = #{pkCount},remarks = #{dto.remarks} where sid = #{dto.sid} + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java index 76791b68fe..be82a75e19 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java @@ -26,6 +26,7 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail; import cn.hutool.core.bean.BeanUtil; +import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo; import com.yxt.common.base.service.MybatisBaseService; @@ -51,51 +52,55 @@ import java.util.List; */ @Service public class WmsInventoryCheckbillDetailService extends MybatisBaseService { - - public void insertByDto(WmsInventoryCheckbillDetailDto dto){ - WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public WmsInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid){ - WmsInventoryCheckbillDetail entity = fetchBySid(sid); - WmsInventoryCheckbillDetailDetailsVo vo = new WmsInventoryCheckbillDetailDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - public void delByMainSid(String dtoSid) { - baseMapper.delByMainSid(dtoSid); - } + public void insertByDto(WmsInventoryCheckbillDetailDto dto) { + WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } - public List selByMainSid(String billSid) { - return baseMapper.selByMainSid(billSid); - } + public WmsInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid) { + WmsInventoryCheckbillDetail entity = fetchBySid(sid); + WmsInventoryCheckbillDetailDetailsVo vo = new WmsInventoryCheckbillDetailDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } - public List reportSum(String sid, String sumType) { - List wmsInventoryCheckbillReportSumVos = new ArrayList<>(); - if ("total".equals(sumType)){ - WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo = baseMapper.reportSumTotal(sid); - wmsInventoryCheckbillReportSumVos.add(wmsInventoryCheckbillReportSumVo); - }else if ("ware".equals(sumType)){ - wmsInventoryCheckbillReportSumVos = baseMapper.reportSumWare(sid); - }else if ("area".equals(sumType)){ - wmsInventoryCheckbillReportSumVos = baseMapper.reportSumArea(sid); - } - return wmsInventoryCheckbillReportSumVos; - } + public void delByMainSid(String dtoSid) { + baseMapper.delByMainSid(dtoSid); + } - public void saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { - int i = new BigDecimal(dto.getLockNum()).compareTo(new BigDecimal(dto.getNum())); - if (i < 0){//盘盈 - BigDecimal pyCount = new BigDecimal(dto.getNum()).subtract(new BigDecimal(dto.getLockNum())); - baseMapper.saveInventoryInfoPY(dto,pyCount); - }else if (i > 0){//盘亏 - BigDecimal pkCount = new BigDecimal(dto.getLockNum()).subtract(new BigDecimal(dto.getNum())); - baseMapper.saveInventoryInfoPK(dto,pkCount); - }else { - baseMapper.saveInventoryInfoZC(dto,dto.getNum()); - } - } + public List selByMainSid(String billSid) { + return baseMapper.selByMainSid(billSid); + } + + public List reportSum(String sid, String sumType) { + List wmsInventoryCheckbillReportSumVos = new ArrayList<>(); + if ("total".equals(sumType)) { + WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo = baseMapper.reportSumTotal(sid); + wmsInventoryCheckbillReportSumVos.add(wmsInventoryCheckbillReportSumVo); + } else if ("ware".equals(sumType)) { + wmsInventoryCheckbillReportSumVos = baseMapper.reportSumWare(sid); + } else if ("area".equals(sumType)) { + wmsInventoryCheckbillReportSumVos = baseMapper.reportSumArea(sid); + } + return wmsInventoryCheckbillReportSumVos; + } + + public void saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) { + int i = new BigDecimal(dto.getLockNum()).compareTo(new BigDecimal(dto.getNum())); + if (i < 0) {//盘盈 + BigDecimal pyCount = new BigDecimal(dto.getNum()).subtract(new BigDecimal(dto.getLockNum())); + baseMapper.saveInventoryInfoPY(dto, pyCount); + } else if (i > 0) {//盘亏 + BigDecimal pkCount = new BigDecimal(dto.getLockNum()).subtract(new BigDecimal(dto.getNum())); + baseMapper.saveInventoryInfoPK(dto, pkCount); + } else { + baseMapper.saveInventoryInfoZC(dto, dto.getNum()); + } + } + + public HandleBean scan(String sid, String content, String houseSid) { + return baseMapper.scan(sid, content, houseSid); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/HandleBean.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/HandleBean.java new file mode 100644 index 0000000000..c0ab2905c9 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/HandleBean.java @@ -0,0 +1,44 @@ +package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app; + +import lombok.Data; + +import java.util.List; + +@Data +public class HandleBean { + + /** + * 损坏数量，默认 0 + */ + private String badNum; + private List files; + /** + * 商品ID + */ + private String goodsID; + /** + * 商品名称 + */ + private String goodsName; + /** + * 图号 + */ + private String goodsSkuCode; + /** + * 本库位库存 + */ + private String lockNum; + /** + * 确认数量/数量，赋值为库存数量 + */ + private String num; + private String remarks; + /** + * 商品记录sid + */ + private String sid; + /** + * 单位 + */ + private String unit; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java index 4f3cb9bc40..a452618809 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java @@ -86,4 +86,6 @@ public interface WmsInventoryRecordMapper extends BaseMapper List selBySourceSid(String sid); List selBySourceSidAndSkuCode(@Param("sid") String sid,@Param("goodsSkuCode") String goodsSkuCode); + + String selByGoodsID(String content); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml index 9d8f682bc1..7cfe249cb6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml @@ -171,4 +171,13 @@ WHERE r.sourceBillSid = #{sid} and r.goodsSkuCode = #{goodsSkuCode} + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java index 49704bfbb7..1f29dab00b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java @@ -364,4 +364,8 @@ public class WmsInventoryRecordService extends MybatisBaseService selBySourceSidAndSkuCode(String sid, String goodsSkuCode) { return baseMapper.selBySourceSidAndSkuCode(sid,goodsSkuCode); } + + public String selByGoodsID(String content) { + return baseMapper.selByGoodsID(content); + } } From 67e73e7f3c08732f21f6d10c2114478dd3830103 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 13 Aug 2024 17:21:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=81=8C=E7=A7=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/biz/astechtitleapply/AsTechTitleApplyService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java index 3670effefc..82ccc81fb5 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java @@ -311,9 +311,11 @@ public class AsTechTitleApplyService extends MybatisBaseService