From 1cca7e93f830abcf5fcc785334f44e3bdd888c34 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 29 May 2024 18:02:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE=E9=A2=86?= =?UTF-8?q?=E6=96=99=E9=80=80=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsBusrepairInventorybillRest.java | 2 +- .../AsBusrepairInventorybillDetailMapper.xml | 27 +++++------- .../wmsoutbill/WmsOutBillInventoryQuery.java | 2 +- .../inventory/wmsoutbill/WmsOutBillMapper.xml | 1 + .../wmsoutbill/WmsOutBillService.java | 4 +- .../inventory/wmsshelfbill/WmsShelfBill.java | 3 +- .../wmsshelfbill/WmsShelfBillMapper.java | 3 ++ .../wmsshelfbill/WmsShelfBillMapper.xml | 15 +++++++ .../wmsshelfbill/WmsShelfBillService.java | 35 ++++++++++++--- .../wmsshelfbill/app/AppShelfBillListVo.java | 43 ++++++++++++++++--- 10 files changed, 100 insertions(+), 35 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java index b3770a7fc7..dbebb801ec 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybill/AsBusrepairInventorybillRest.java @@ -46,7 +46,7 @@ public class AsBusrepairInventorybillRest { return asBusrepairInventorybillService.newQuitBill(dto); } - @PostMapping("/details") + @GetMapping("/details") @ApiOperation("详情") ResultBean details(@RequestParam("sid") String sid) { return asBusrepairInventorybillService.details(sid); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml index d5f5dda608..54c235f108 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml @@ -15,25 +15,18 @@ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java index d1a39e3daa..86dace6318 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryQuery.java @@ -30,6 +30,6 @@ public class WmsOutBillInventoryQuery implements Query { private String orgPath; - private String busrepairBillSid;//维修工单sid + private String busrepairBillsid;//维修工单sid private String name; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml index 068029d163..b840e7ddd4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillMapper.xml @@ -36,6 +36,7 @@ wi.goodsSpuName, wi.goodsSkuTitle, wi.goodsSkuCode, + wi.goodsSkuSid, wi.goodsSkuOwnSpec, wi.unit, wi.warehouseSid, diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java index a1511c900e..e1cdadce95 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillService.java @@ -149,11 +149,11 @@ public class WmsOutBillService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.getInventoryList(page, qw); - if (StringUtils.isNotBlank(query.getBusrepairBillSid())) { + if (StringUtils.isNotBlank(query.getBusrepairBillsid())) { List records = pagging.getRecords(); for (WmsOutBillInventoryVo record : records) { //维修出入库查询已出库数量 - String billSid = query.getBusrepairBillSid(); + String billSid = query.getBusrepairBillsid(); String chuKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "0", record.getGoodsID()).getData(); String ruKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "1", record.getGoodsID()).getData(); BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount)); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java index 25915b95fe..7eee7d728b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBill.java @@ -21,7 +21,8 @@ public class WmsShelfBill extends BaseEntity { private String createByName; @ApiModelProperty("0新建，1已完成") private Integer billState; - + @ApiModelProperty("0新建，1已完成") + private String billStateValue; private String createOrgSid; private String useOrgSid; private String deptSid; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java index 60a7d5dc61..abea45be14 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.wms.biz.inventory.wmsshelfbill.app.AppShelfBillListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,6 @@ public interface WmsShelfBillMapper extends BaseMapper { String selectNum(String goodsId); String selectCodeNum(String bill); + + IPage applistPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml index f30e64fd6a..f0be9249bc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillMapper.xml @@ -54,4 +54,19 @@ order by id desc limit 1 + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index bedb857548..0ff728fba3 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -159,6 +159,13 @@ public class WmsShelfBillService extends MybatisBaseService applistPage(PagerQuery pq) { - PagerVo p = new PagerVo<>(); - List list = new ArrayList<>(); - AppShelfBillListVo v = new AppShelfBillListVo(); - v.setSid("222"); - list.add(v); - p.setRecords(list); + AppShelfBillListQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("wsb.upShelfSid",query.getUserSid()); + } + //ToDo:添加查询条件 + if (StringUtils.isNotBlank(query.getName())) { + qw.and(wrapper -> wrapper.like("wsb.billNo", query.getName()) + .or().like("wsb.sourceBillNo", query.getName()) + .or().like("wsb.billStateValue", query.getName()) + ); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.applistPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelfBillListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelfBillListVo.java index e706228438..c6e4375169 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelfBillListVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/app/AppShelfBillListVo.java @@ -10,11 +10,40 @@ import lombok.Data; */ @Data public class AppShelfBillListVo implements Vo { - private String billNo; //单据编号 - private String billState;//单据状态 - private String receiptBillNo;//收货单号 - private String receiptName;//收货人 - private String shelName;//上架人 - private String time;//日期 - private String sid; + /** + * 收货单号 + */ + private String receivingId; + /** + * 收货人 + */ + private String receivingUser; + /** + * 记录按钮，有记录true + */ + private boolean recordBtn; + /** + * 上架按钮，上架还有剩余true + */ + private boolean shelvesBtn; + /** + * 上架单创建时间 + */ + private String shelvesCreateTime; + /** + * 上架单编号 + */ + private String shelvesId; + /** + * 上架单sid + */ + private String shelvesSid; + /** + * 单据状态 + */ + private String shelvesState; + /** + * 上架人 + */ + private String shelvesUsers; }