From 3d115160e3d1add744d1863278e06fa0ddcb63c3 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 22 May 2024 18:02:44 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/wmsansbill/WmsAnsBillMapper.xml | 32 ++-- .../wmsansbilldetail/WmsAnsBillDetail.java | 4 +- .../WmsAnsBillDetailMapper.java | 5 + .../WmsAnsBillDetailMapper.xml | 15 +- .../WmsAnsBillDetailService.java | 9 + .../wmsansbilldetail/WmsAnsListDetailsVo.java | 16 +- .../wmsreceiptbill/WmsReceiptBillMapper.java | 9 + .../wmsreceiptbill/WmsReceiptBillMapper.xml | 26 ++- .../wmsreceiptbill/WmsReceiptBillService.java | 155 ++++++++++++++++-- .../WmsReceiptBillDetail.java | 16 +- .../WmsReceiptBillDetailDto2.java | 5 +- .../WmsReceiptBillDetailMapper.xml | 13 +- .../WmsReceiptBillDetailService.java | 8 +- .../WmsReceiptBillDetailVo.java | 2 + .../wmsshelfbill/WmsShelfBillService.java | 4 +- 15 files changed, 255 insertions(+), 64 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml index b639781547..01d102b6fb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml @@ -11,18 +11,20 @@ - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java index 9941897dc3..27ddb3a58e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java @@ -35,9 +35,9 @@ public class WmsAnsBillDetail extends BaseEntity { @ApiModelProperty("预约数量（采购订单数量）") private String orderCount; @ApiModelProperty("待入库数量-根据收货单计算") - private Integer waitInCount; + private BigDecimal waitInCount; @ApiModelProperty("实际入库数量-根据收货单计算") - private Integer actualInCount; + private BigDecimal actualInCount; @ApiModelProperty("税额") private BigDecimal taxAmount; @ApiModelProperty("含税价") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java index fc76c4804d..24fc92ee77 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java @@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsansbilldetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -15,4 +16,8 @@ public interface WmsAnsBillDetailMapper extends BaseMapper { int deleteDetails(String sid); List selectByBillSid(String sid); + + String selGoodsCountBySpuSidAndSouceSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid); + + WmsAnsBillDetail fetchBySpuSidAndBillSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml index 513761c370..b0cd6eb5a6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml @@ -19,8 +19,19 @@ wd.cost, wd.taxAmount, wd.taxPrice, - wd.amount + wd.amount, + wd.goodsSkuSid, + wd.goodSpuSid from wms_ans_bill_detail wd where billSid = #{sid} - \ No newline at end of file + + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java index 47c79de71d..257ae0ff54 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java @@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsansbilldetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; import java.util.List; @@ -26,4 +27,12 @@ public class WmsAnsBillDetailService extends MybatisBaseService selectByBillSid(String sid) { return baseMapper.selectByBillSid(sid); } + + public String selGoodsCountBySpuSidAndSouceSid(String goodsSpuSid,String sourceBillSid) { + return baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid,sourceBillSid); + } + + public WmsAnsBillDetail fetchBySpuSidAndBillSid(String goodsSpuSid, String sourceBillSid) { + return baseMapper.fetchBySpuSidAndBillSid(goodsSpuSid,sourceBillSid); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java index 56aa388fcc..92e52102e7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java @@ -32,10 +32,10 @@ public class WmsAnsListDetailsVo { private String orderCount; //待收货数量 @ApiModelProperty("待入库数量-根据收货单计算") - private Integer waitInCount; + private String waitInCount; //已收货数量 @ApiModelProperty("实际入库数量-根据收货单计算") - private Integer actualInCount; + private String actualInCount; //入库价 @ApiModelProperty("单位成本（采购价）") private String cost; @@ -46,14 +46,16 @@ public class WmsAnsListDetailsVo { //采购金额 @ApiModelProperty("金额") private String amount; - - - /* @ApiModelProperty("商品基础信息sid") + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品基础信息sid") private String goodSpuSid; + + /* @ApiModelProperty("商品名称") private String goodsSpuName; - @ApiModelProperty("商品Skusid") - private String goodsSkuSid;*/ + + */ } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java index 2b7347defc..90c93c6b98 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java @@ -4,9 +4,12 @@ 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.wmsreceiptbilldetail.WmsReceiptBillDetail; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @description: * @author: dimengzhe @@ -17,4 +20,10 @@ public interface WmsReceiptBillMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WmsReceiptBillInitVo getDetailsInit(String sid); + + String selectNum(String bill); + + String selGoodsCountBySpuSidAndSouceSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid); + + List selGoodsListCountBySpuSidAndSouceSid(@Param("goodsSpuSid")String goodsSpuSid, @Param("sourceBillSid")String sourceBillSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml index 5fca13e4e8..545eed94c9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml @@ -39,4 +39,28 @@ from wms_receipt_bill wrb where wrb.sid = #{sid} - \ No newline at end of file + + + + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java index e50ae83d99..650569b608 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java @@ -13,6 +13,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBill; import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService; +import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail; import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailService; import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo; import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.*; @@ -20,9 +21,14 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailB import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper; import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.utils.BillNo; +import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -46,6 +52,8 @@ public class WmsReceiptBillService extends MybatisBaseService listPage(PagerQuery pq) { WmsReceiptBillQuery query = pq.getParams(); @@ -106,6 +114,23 @@ public class WmsReceiptBillService extends MybatisBaseService resultBean1 = sysOrganizationFeign.fetchBySid(createOrgSid); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType("SHD"); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + public ResultBean saveOrUpdateBill2(WmsReceiptBillDto2 dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -118,13 +143,57 @@ public class WmsReceiptBillService extends MybatisBaseService pcList = dto.getPcList(); pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); - } - if("0".equals(dto.getBillStateKey())){ - wmsReceiptBill.setBillState("0"); - }else{ - wmsReceiptBill.setBillState("1"); +// wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); + wmsReceiptBillDetailService.deleteByBillSid(sid); + for (WmsReceiptBillDetailDto2 detail : list) { + WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail(); + BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid"); + wmsReceiptBillDetail.setBillSid(sid); + wmsReceiptBillDetailService.insert(wmsReceiptBillDetail); + String goodsSpuSid = detail.getGoodSpuSid(); + String sourceBillSid = dto.getSourceBillSid(); +// String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid); + List details = baseMapper.selGoodsListCountBySpuSidAndSouceSid(goodsSpuSid,sourceBillSid); + WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid); + BigDecimal count = new BigDecimal("0"); + if (!details.isEmpty()) { + for (WmsReceiptBillDetail receiptBillDetail : details) { + count = count.add(receiptBillDetail.getActualInCount()); + } + } + if (null != goods) { + BigDecimal orderCount = new BigDecimal(goods.getOrderCount()); + goods.setActualInCount(count); + goods.setWaitInCount(orderCount.subtract(count)); + wmsAnsBillDetailService.updateById(goods); + } + } + WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid()); + List vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid()); + if (!vos.isEmpty()) { + HashSet integers = new HashSet<>(); + for (WmsAnsListDetailsVo vo : vos) { + BigDecimal count = new BigDecimal("0"); + if (StringUtils.isNotBlank(vo.getWaitInCount())) { + count = new BigDecimal(vo.getWaitInCount()); + } + if (count.compareTo(BigDecimal.ZERO) < 0) { + integers.add(2); + } else { + integers.add(1); + } + } + if (integers.size() > 1) { + wmsAnsBill.setBillState(1); + } else { + wmsAnsBill.setBillState(2); + } + } + wmsAnsBillService.updateById(wmsAnsBill); } + wmsReceiptBill.setBillState("0"); + String applyCode = getApplyCode(dto.getCreateOrgSid()); + wmsReceiptBill.setBillNo(applyCode); baseMapper.insert(wmsReceiptBill); } else { @@ -138,12 +207,47 @@ public class WmsReceiptBillService extends MybatisBaseService pcList = dto.getPcList(); pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); - } - if("0".equals(dto.getBillStateKey())){ - wmsReceiptBill.setBillState("0"); - }else{ - wmsReceiptBill.setBillState("1"); + wmsReceiptBillDetailService.deleteByBillSid(sid); +// wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); + for (WmsReceiptBillDetailDto2 detail : list) { + WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail(); + BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid"); + wmsReceiptBillDetail.setBillSid(sid); + wmsReceiptBillDetailService.insert(wmsReceiptBillDetail); + String goodsSpuSid = detail.getGoodSpuSid(); + String sourceBillSid = dto.getSourceBillSid(); + String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid); + WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid); + BigDecimal count = new BigDecimal(goodsCount); + if (null != goods) { + BigDecimal orderCount = new BigDecimal(goods.getOrderCount()); + goods.setActualInCount(count); + goods.setWaitInCount(orderCount.subtract(count)); + wmsAnsBillDetailService.updateById(goods); + } + } + WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid()); + List vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid()); + if (!vos.isEmpty()) { + HashSet integers = new HashSet<>(); + for (WmsAnsListDetailsVo vo : vos) { + BigDecimal count = new BigDecimal("0"); + if (StringUtils.isNotBlank(vo.getWaitInCount())) { + count = new BigDecimal(vo.getWaitInCount()); + } + if (count.compareTo(BigDecimal.ZERO) < 0) { + integers.add(2); + } else { + integers.add(1); + } + } + if (integers.size() > 1) { + wmsAnsBill.setBillState(1); + } else { + wmsAnsBill.setBillState(2); + } + } + wmsAnsBillService.updateById(wmsAnsBill); } baseMapper.updateById(wmsReceiptBill); } @@ -154,21 +258,36 @@ public class WmsReceiptBillService extends MybatisBaseService rb = ResultBean.fireFail(); WmsReceiptBillVo wmsReceiptBillVo = new WmsReceiptBillVo(); WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid); - BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid"); - wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getSourceBillNo()); + BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid", "billNo"); + wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo()); wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid()); wmsReceiptBillVo.setCreateTime(DateUtil.today()); if (wmsAnsBill.getBillState() == 0) { wmsReceiptBillVo.setBillStateKey("0"); - wmsReceiptBillVo.setBillState("新建"); - } else { - wmsReceiptBillVo.setBillState("完成"); + wmsReceiptBillVo.setBillState("在途"); + } else if (wmsAnsBill.getBillState() == 1) { + wmsReceiptBillVo.setBillState("部分收货"); wmsReceiptBillVo.setBillStateKey("1"); + } else if (wmsAnsBill.getBillState() == 2) { + wmsReceiptBillVo.setBillState("已收货"); + wmsReceiptBillVo.setBillStateKey("2"); + } else if (wmsAnsBill.getBillState() == 3) { + wmsReceiptBillVo.setBillState("已取消"); + wmsReceiptBillVo.setBillStateKey("3"); } List list = wmsAnsBillDetailService.selectByBillSid(sourceSid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { - List lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsReceiptBillDetailVo.class)).collect(Collectors.toList()); +// List lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsReceiptBillDetailVo.class)).collect(Collectors.toList()); +// wmsReceiptBillVo.setList(lists); + List lists = new ArrayList<>(); + for (WmsAnsListDetailsVo wmsAnsListDetailsVo : list) { + WmsReceiptBillDetailVo detailsVo = new WmsReceiptBillDetailVo(); + BeanUtil.copyProperties(wmsAnsListDetailsVo, detailsVo); + detailsVo.setIsQuality(0); + detailsVo.setQualityState(0); + lists.add(detailsVo); + } wmsReceiptBillVo.setList(lists); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java index eebb7ffa10..74bc8d146b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java @@ -47,12 +47,12 @@ public class WmsReceiptBillDetail extends BaseEntity { @ApiModelProperty("载具说明") private String packageRemark; - @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("仓库名称") - private String warehouseName; - @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位名称") - private String warehouseRackName; +// @ApiModelProperty("仓库sid") +// private String warehouseSid; +// @ApiModelProperty("仓库名称") +// private String warehouseName; +// @ApiModelProperty("库位sid") +// private String warehouseRackSid; +// @ApiModelProperty("库位名称") +// private String warehouseRackName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java index 76abe39d99..36e75f5400 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java @@ -11,9 +11,12 @@ import lombok.Data; **/ @Data public class WmsReceiptBillDetailDto2 { - + @ApiModelProperty("商品名称") + private String goodsSpuName; @ApiModelProperty("商品Skusid") private String goodsSkuSid; + @ApiModelProperty("商品goodSpuSid") + private String goodSpuSid; @ApiModelProperty("商品Sku名称") private String goodsSkuTitle; @ApiModelProperty("商品sku编码") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml index 5a05fe3d9d..793e3af63c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml @@ -13,10 +13,10 @@ wrbd.goodsSkuCode, wrbd.goodsSkuOwnSpec, wrbd.unit, - wrbd.warehouseSid, - wrbd.warehouseName, - wrbd.warehouseRackSid, - wrbd.warehouseRackName, +-- wrbd.warehouseSid, +-- wrbd.warehouseName, +-- wrbd.warehouseRackSid, +-- wrbd.warehouseRackName, wrbd.actualInCount, wrbd.rejectCount, wrbd.rejectReason, @@ -24,7 +24,8 @@ wrbd.qualityState, wrbd.packageRemark, wrbd.state, - wrbd.sid detailsSid + wrbd.sid detailsSid, + wrbd.goodsSpuName from wms_receipt_bill_detail wrbd where billSid = #{sid} @@ -40,4 +41,4 @@ - \ No newline at end of file + diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java index 62102d16c6..b250da84cf 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java @@ -42,6 +42,10 @@ public class WmsReceiptBillDetailService extends MybatisBaseService list, List pcList) { baseMapper.deleteByBillSid(sid); list.forEach(v -> { @@ -67,7 +71,7 @@ public class WmsReceiptBillDetailService extends MybatisBaseService selectByBillSid(String sid,List sidList) { - return baseMapper.selectByBillSid(sid,sidList); + public List selectByBillSid(String sid, List sidList) { + return baseMapper.selectByBillSid(sid, sidList); } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java index c18800b430..d8592fbb3b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java @@ -18,6 +18,8 @@ public class WmsReceiptBillDetailVo { @ApiModelProperty("商品Skusid") private String goodsSkuSid; + @ApiModelProperty("商品goodSpuSid") + private String goodSpuSid; @ApiModelProperty("商品Sku名称") // private String goodsSkuTitle; private String goodsSpuName; 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 1e800f2e71..2f6c906970 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 @@ -241,8 +241,8 @@ public class WmsShelfBillService extends MybatisBaseService Date: Thu, 23 May 2024 10:27:11 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E3=80=81=E6=94=B6=E8=B4=A7=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=8F=8A=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/utils/index.js | 15 +- .../views/storage/deliveryNotice/index.vue | 7 +- .../storage/deliveryNotice/receiptAdd.vue | 160 ++++----- .../storage/deliveryNotice/receiptInfo.vue | 2 +- .../views/storage/receivingGoods/index.vue | 5 +- .../receivingGoods/receivingGoodsAdd.vue | 308 ++++-------------- .../receivingGoods/receivingGoodsInfo.vue | 2 +- 7 files changed, 150 insertions(+), 349 deletions(-) diff --git a/yxt-as-ui/src/utils/index.js b/yxt-as-ui/src/utils/index.js index 4830c04890..9f9cb14e2a 100644 --- a/yxt-as-ui/src/utils/index.js +++ b/yxt-as-ui/src/utils/index.js @@ -45,7 +45,9 @@ export function parseTime(time, cFormat) { const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => { const value = formatObj[key] // Note: getDay() returns 0 on Sunday - if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } + if (key === 'a') { + return ['日', '一', '二', '三', '四', '五', '六'][value] + } return value.toString().padStart(2, '0') }) return time_str @@ -115,3 +117,14 @@ export function param2Obj(url) { }) return obj } + +/** + * 获取当前日期 + */ +export function getCurrentDate() { + let now = new Date(); + let year = now.getFullYear(); + let month = now.getMonth() + 1; + let day = now.getDate(); + return year + "-" + month + "-" + day; +} diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue index c787711690..5e5f861870 100644 --- a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue +++ b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue @@ -76,10 +76,10 @@ 查看 - + - + @@ -303,6 +303,9 @@ }, loadList() { this.tableLoading = true + this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') + this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.queryParams.params.menuUrl = this.$route.path req.listPage(this.queryParams).then((resp) => { this.tableLoading = false if (resp.success) { diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue index 6121da74e0..34bb29ae88 100644 --- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue +++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue @@ -16,7 +16,7 @@
- +
基础信息
@@ -28,7 +28,7 @@
制单部门
- {{ formobj.departmentName }} + {{ formobj.deptName }}
单据日期
@@ -60,10 +60,12 @@ -
到货日期
- - +
* 到货日期
+ + + +
单据状态
@@ -205,6 +207,9 @@ diff --git a/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue b/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue index 4b1c3f088f..42ffa5d4ae 100644 --- a/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue +++ b/yxt-as-ui/src/views/storage/upShelf/upShelfInfo.vue @@ -25,7 +25,7 @@ {{ formobj.billNo }} -
制单人姓名
+
制单人
{{ formobj.createByName }} @@ -40,11 +40,17 @@
来源单号
{{ formobj.sourceBillNo }} - +
单据状态
{{ formobj.billState }} + +
上架人
+ {{ formobj.billState }} + + + @@ -66,11 +72,12 @@ - + + From 90fd9cfac55df90b555b35873cf6007cefe3f6ef Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 23 May 2024 11:20:25 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=88=B0=E8=B4=A7=E9=80=9A=E7=9F=A5=E5=8D=95=EF=BC=8C=E5=88=92?= =?UTF-8?q?=E6=89=A3=E8=AE=A4=E6=AC=BE=E7=AE=A1=E7=90=86=E4=BF=9D=E5=AD=98?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBuckleApplyService.java | 9 +++- .../PmsPurchaseBillService.java | 10 +++- .../feign/wms/wmsansbill/WmsAnsBillDto.java | 5 +- .../biz/inventory/wmsansbill/WmsAnsBill.java | 4 ++ .../inventory/wmsansbill/WmsAnsBillDto.java | 5 +- .../inventory/wmsansbill/WmsAnsBillMapper.xml | 4 +- .../wmsreceiptbill/WmsReceiptBill.java | 4 ++ .../wmsreceiptbill/WmsReceiptBillDto2.java | 4 ++ .../wmsreceiptbill/WmsReceiptBillInitVo.java | 4 ++ .../wmsreceiptbill/WmsReceiptBillMapper.xml | 3 ++ .../wmsreceiptbill/WmsReceiptBillService.java | 53 +++++++++++-------- .../wmsreceiptbill/WmsReceiptBillVo.java | 5 +- .../WmsReceiptBillDetail.java | 6 +++ .../WmsReceiptBillDetailDto2.java | 2 + 14 files changed, 88 insertions(+), 30 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java index b3b0cf9441..93c748a686 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java @@ -283,7 +283,9 @@ public class LoanBuckleApplyService extends MybatisBaseService historySids = record.getHistorySids(); if (!historySids.isEmpty()) { @@ -329,7 +331,9 @@ public class LoanBuckleApplyService extends MybatisBaseService historySids = record.getHistorySids(); if (!historySids.isEmpty()) { @@ -398,6 +402,7 @@ public class LoanBuckleApplyService extends MybatisBaseService wmsAnsBillDetailList = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java index 5d205434bf..7ab8d2b948 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java @@ -48,4 +48,8 @@ public class WmsAnsBill extends BaseEntity { private String useOrgSid; @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java index ea85f5165b..182660cee7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillDto.java @@ -51,6 +51,9 @@ public class WmsAnsBillDto { private String useOrgSid; @ApiModelProperty("创建组织sid") private String createOrgSid; - + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; private List wmsAnsBillDetailList = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml index 01d102b6fb..e60378425a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml @@ -42,7 +42,9 @@ wab.supplierSid, wab.supplierName, DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate, - wab.billState, + case wab.billState when 0 then '在途' when 1 then '部分收货' + when 2 then '已收货' when 3 then '已取消' + end as billState, wab.reviewStatus from wms_ans_bill wab where sid = #{sid} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBill.java index c0b6c6bda8..9898140b85 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBill.java @@ -42,4 +42,8 @@ public class WmsReceiptBill extends BaseEntity { private String useOrgSid; @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillDto2.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillDto2.java index aa98223962..ceb9998279 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillDto2.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillDto2.java @@ -50,6 +50,10 @@ public class WmsReceiptBillDto2 { private String useOrgSid; @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; @ApiModelProperty("商品列表") private List list = new ArrayList<>(); @ApiModelProperty("批次列表") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillInitVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillInitVo.java index f6448d5567..927541b97b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillInitVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillInitVo.java @@ -49,6 +49,10 @@ public class WmsReceiptBillInitVo { private String useOrgSid; @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门") + private String deptName; @ApiModelProperty("商品列表") private List list = new ArrayList<>(); @ApiModelProperty("批次列表") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml index 545eed94c9..30bc4b2165 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml @@ -30,10 +30,13 @@ wrb.supplierSid, wrb.supplierName, DATE_FORMAT(wrb.deliveryDate,'%Y-%m-%d') as deliveryDate, + DATE_FORMAT(wrb.createTime,'%Y-%m-%d') as createTime, case wrb.billState when '0' then '新建' when '1' then '已完成' end as billState, wrb.remarks, + wrb.deptSid, + wrb.deptName, wrb.useOrgSid, wrb.createOrgSid from wms_receipt_bill wrb diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java index 650569b608..a750912fdf 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java @@ -146,27 +146,22 @@ public class WmsReceiptBillService extends MybatisBaseService details = baseMapper.selGoodsListCountBySpuSidAndSouceSid(goodsSpuSid,sourceBillSid); + String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid); WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid); - BigDecimal count = new BigDecimal("0"); - if (!details.isEmpty()) { - for (WmsReceiptBillDetail receiptBillDetail : details) { - count = count.add(receiptBillDetail.getActualInCount()); - } - } + BigDecimal count = new BigDecimal(goodsCount); if (null != goods) { BigDecimal orderCount = new BigDecimal(goods.getOrderCount()); - goods.setActualInCount(count); - goods.setWaitInCount(orderCount.subtract(count)); + BigDecimal accCount = count.add(new BigDecimal(detail.getActualInCount())); + goods.setActualInCount(accCount); + goods.setWaitInCount(orderCount.subtract(accCount)); wmsAnsBillDetailService.updateById(goods); } + WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail(); + BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid"); + wmsReceiptBillDetail.setBillSid(sid); + wmsReceiptBillDetailService.insert(wmsReceiptBillDetail); } WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid()); List vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid()); @@ -177,7 +172,7 @@ public class WmsReceiptBillService extends MybatisBaseService vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid()); @@ -235,7 +236,7 @@ public class WmsReceiptBillService extends MybatisBaseService list = new ArrayList<>(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java index 74bc8d146b..8d9bec2a0a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java @@ -47,6 +47,12 @@ public class WmsReceiptBillDetail extends BaseEntity { @ApiModelProperty("载具说明") private String packageRemark; + @ApiModelProperty("税额") + private BigDecimal taxAmount; + @ApiModelProperty("含税价") + private BigDecimal taxPrice; + @ApiModelProperty("金额") + private BigDecimal amount; // @ApiModelProperty("仓库sid") // private String warehouseSid; // @ApiModelProperty("仓库名称") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java index 36e75f5400..79d6ca10ec 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java @@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * @description: * @author: dimengzhe From 9ff07b4bb9618fdb418dc4e1da83b7370aeb75c2 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 23 May 2024 11:23:37 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E7=B4=A2=E8=B5=94=E5=8D=95=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/operation/claimstatement.js | 23 ++ yxt-as-ui/src/router/index.js | 6 + .../claimstatement/claimstatement.vue | 378 ++++++++++++++++++ 3 files changed, 407 insertions(+) create mode 100644 yxt-as-ui/src/api/operation/claimstatement.js create mode 100644 yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue diff --git a/yxt-as-ui/src/api/operation/claimstatement.js b/yxt-as-ui/src/api/operation/claimstatement.js new file mode 100644 index 0000000000..fe0d648a07 --- /dev/null +++ b/yxt-as-ui/src/api/operation/claimstatement.js @@ -0,0 +1,23 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/as/v1/AsBusclaimBill/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + downloadExcel: function() { + return request({ + url: '/as/v1/AsBusclaimBill/downloadExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + headers: { + 'Content-Type': 'application/json' + } + }) + } +} diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 5c12c3a17f..daf92f75f6 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -110,6 +110,12 @@ export const constantRoutes = [{ name: 'PendingClaim', meta: { title: '待索赔维修工单', noCache: true } }, + { + path: '/claimstatement/claimstatement', + component: () => import('@/views/operation/claimstatement/claimstatement.vue'), + name: 'ClaimStatement', + meta: { title: '厂家索赔单管理', noCache: true } + }, ] }, { diff --git a/yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue b/yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue new file mode 100644 index 0000000000..8adcb22840 --- /dev/null +++ b/yxt-as-ui/src/views/operation/claimstatement/claimstatement.vue @@ -0,0 +1,378 @@ + + + + From 8919f520b7abbc63584f6fbd6f146f68ccf1ce0c Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 23 May 2024 14:37:29 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=BB=84=E7=BB=87sid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/deliveryNotice/receiptAdd.vue | 29 ++++++++++++------- .../storage/deliveryNotice/receiptInfo.vue | 2 +- .../receivingGoods/receivingGoodsInfo.vue | 2 +- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue index 34bb29ae88..12d87c3ff3 100644 --- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue +++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue @@ -227,11 +227,11 @@ busTypeValue: "", createTime: '', createByName: window.sessionStorage.getItem('name'), - deptName: window.sessionStorage.getItem('departmentName'), - deptSid: window.sessionStorage.getItem('departmentSid'), + deptName: '', + deptSid: '', createBySid: window.sessionStorage.getItem('userSid'), - useOrgSid: window.sessionStorage.getItem('departmentSid'), - createOrgSid: window.sessionStorage.getItem('orgSid'), + useOrgSid: '', + createOrgSid: '', billState: '新建', billStateKey: 0, reviewStatus: "", @@ -261,6 +261,16 @@ }, created() {}, methods: { + // getOrgPathSid() { + // getOrgSidByPath({ + // orgPath: window.sessionStorage.getItem('defaultOrgPath') + // }).then((res) => { + // if (res.success) { + // this.formobj.createOrgSid = res.data + // this.formobj.useOrgSid = res.data + // } + // }) + // }, selectSupplierName(val) { console.log("supplierNameSelect", val); @@ -620,6 +630,7 @@ showEdit(row) { this.getWarehouseList() this.getsupplierLust() + // this.getOrgPathSid() var params = { sourceSid: row.sid } @@ -630,12 +641,10 @@ this.formobj = resp.data this.formobj.deliveryDate = getCurrentDate() - this.formobj.createByName = window.sessionStorage.getItem('name') - this.formobj.deptName = window.sessionStorage.getItem('departmentName') - this.formobj.deptSid = window.sessionStorage.getItem('departmentSid') - this.formobj.createBySid = window.sessionStorage.getItem('userSid') - this.formobj.useOrgSid = window.sessionStorage.getItem('departmentSid') - this.formobj.createOrgSid = window.sessionStorage.getItem('orgSid') + this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window + .sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1) + this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1) } }) diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue b/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue index 7b7e1a9611..0ffbc86369 100644 --- a/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue +++ b/yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue @@ -59,7 +59,7 @@
单据状态
- {{ formobj.billstate }} + {{ formobj.billState }}
审核状态
diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue index b2a75cc5ec..68300ae46a 100644 --- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue +++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsInfo.vue @@ -25,7 +25,7 @@
制单部门
- {{ formobj.departmentName }} + {{ formobj.deptName }} From 3f07a85dc9a6576cb6915269af3b893f39329630 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 23 May 2024 14:58:46 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E3=80=81=E9=87=91=E9=A2=9D=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receivingGoods/receivingGoodsAdd.vue | 107 ++++++++++-------- .../receivingGoods/receivingGoodsInfo.vue | 6 +- 2 files changed, 63 insertions(+), 50 deletions(-) diff --git a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue index 98a99933f1..3058c3968e 100644 --- a/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue +++ b/yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue @@ -194,14 +194,14 @@ - + - + - - - + + + From e949165323e80df34adb9a66a83163eeb5b91583 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Thu, 23 May 2024 16:01:55 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/wmsansbill/WmsAnsBillMapper.xml | 1 + .../inventory/wmsansbill/WmsAnsBillQuery.java | 7 +++ .../wmsansbill/WmsAnsBillService.java | 43 +++++++++++++- .../wmsreceiptbill/WmsReceiptBillMapper.xml | 5 +- .../wmsreceiptbill/WmsReceiptBillQuery.java | 7 ++- .../wmsreceiptbill/WmsReceiptBillService.java | 57 ++++++++++++++++++- .../WmsReceiptBillDetail.java | 2 + .../WmsReceiptBillDetailMapper.xml | 4 ++ 8 files changed, 121 insertions(+), 5 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml index e60378425a..5e1c1b462b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml @@ -26,6 +26,7 @@ wab.reviewStatus, wab.refuseReason from wms_ans_bill wab + LEFT JOIN anrui_portal.sys_organization as s ON wab.deptSid = s.sid ${ew.sqlSegment} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillQuery.java index c825aa5557..8e50830e65 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillQuery.java @@ -34,4 +34,11 @@ public class WmsAnsBillQuery implements Query { @ApiModelProperty("外部单号（业务单据编号）") private String sourceBillNo; + + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java index bc279277e3..9ed63ce694 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillService.java @@ -9,12 +9,15 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaVo; import com.yxt.wms.biz.inventory.wmsansbilldetail.*; import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBill; import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillQuery; import com.yxt.wms.biz.inventory.wmsreceiptbill.WmsReceiptBillVo; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.utils.BillNo; import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +38,8 @@ public class WmsAnsBillService extends MybatisBaseService saveOrUpdateBill(WmsAnsBillDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); @@ -106,6 +110,43 @@ public class WmsAnsBillService extends MybatisBaseService qw = new QueryWrapper<>(); //ToDo:添加查询条件 if (query != null) { + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("wab.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //单据编号 if (StringUtils.isNotBlank(query.getBillNo())) { qw.like("wab.billNo", query.getBillNo()); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml index 30bc4b2165..518cd3eaba 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml @@ -10,8 +10,11 @@ wrb.supplierName, DATE_FORMAT(wrb.createTime, '%Y-%m-%d') as createTime, DATE_FORMAT(wrb.deliveryDate, '%Y-%m-%d') as deliveryDate, - wrb.billState + case wrb.billState + when '0' then '新建' + when '1' then '已完成' end as billState from wms_receipt_bill wrb + LEFT JOIN anrui_portal.sys_organization as s ON wrb.deptSid = s.sid ${ew.sqlSegment} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java index 52064cc3a6..f6a9743658 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillQuery.java @@ -28,6 +28,11 @@ public class WmsReceiptBillQuery implements Query { private String deliveryDateEnd; @ApiModelProperty("单据状态") private String billState; - + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java index a750912fdf..374e524852 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java @@ -13,6 +13,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBill; import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService; +import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillVo; import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail; import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailService; import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo; @@ -21,8 +22,10 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailB import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2; import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper; import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; import com.yxt.wms.utils.BillNo; import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; @@ -54,10 +57,49 @@ public class WmsReceiptBillService extends MybatisBaseService listPage(PagerQuery pq) { WmsReceiptBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); + + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("s.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("s.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("wrb.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + //ToDo:添加查询条件 if (StringUtils.isNotBlank(query.getBillNo())) { qw.like("wrb.billNo", query.getBillNo()); @@ -201,6 +243,13 @@ public class WmsReceiptBillService extends MybatisBaseService list = dto.getList(); list.removeAll(Collections.singleton(null)); @@ -336,7 +385,6 @@ public class WmsReceiptBillService extends MybatisBaseService confirm(WmsReceiptBillDto2 dto) { ResultBean rb = ResultBean.fireFail(); - dto.setBillState("1"); List list = dto.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { @@ -348,6 +396,11 @@ public class WmsReceiptBillService extends MybatisBaseService resultBean = saveOrUpdateBill2(dto); String sid = resultBean.getData(); + WmsReceiptBill wmsReceiptBill = fetchBySid(sid); + if (null != wmsReceiptBill) { + wmsReceiptBill.setBillState("1"); + baseMapper.updateById(wmsReceiptBill); + } return rb.success().setData(sid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java index 8d9bec2a0a..e0cb1afa64 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java @@ -53,6 +53,8 @@ public class WmsReceiptBillDetail extends BaseEntity { private BigDecimal taxPrice; @ApiModelProperty("金额") private BigDecimal amount; + @ApiModelProperty("单位成本（采购价）") + private BigDecimal cost; // @ApiModelProperty("仓库sid") // private String warehouseSid; // @ApiModelProperty("仓库名称") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml index 793e3af63c..798407ce14 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml @@ -17,6 +17,10 @@ -- wrbd.warehouseName, -- wrbd.warehouseRackSid, -- wrbd.warehouseRackName, + wrbd.amount, + wrbd.cost, + wrbd.taxAmount, + wrbd.taxPrice, wrbd.actualInCount, wrbd.rejectCount, wrbd.rejectReason, From a63beb1bac3f6bfd56ed6ab8f47746100bb5faba Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Thu, 23 May 2024 17:05:01 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/storage/deliveryNotice/index.vue | 50 ++++++--- .../views/storage/receivingGoods/index.vue | 66 ++++++------ .../receivingGoods/upShelfAddRecord.vue | 47 ++++---- .../src/views/storage/upShelf/upShelfAdd.vue | 101 ++++++++++-------- .../src/views/storage/upShelf/upShelfInfo.vue | 13 +-- 5 files changed, 161 insertions(+), 116 deletions(-) diff --git a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue index 5e5f861870..eea8b7279e 100644 --- a/yxt-as-ui/src/views/storage/deliveryNotice/index.vue +++ b/yxt-as-ui/src/views/storage/deliveryNotice/index.vue @@ -25,7 +25,7 @@ - + @@ -43,13 +43,13 @@ - + - + @@ -209,30 +209,46 @@ sids: [], selectionList: [], busTypeList: [{ - name: "业务类型1", + name: "采购预约", + sid: "0" + }, + { + name: "调拨预约", sid: "1" }, { - name: "业务类型2", + name: "其他预约", sid: "2" } ], billStateList: [{ - name: "新建", + name: "在途", sid: "0" }, { - name: "完成", + name: "部分收货", sid: "1" + }, + { + name: "已收货", + sid: "2" + }, + { + name: "已取消", + sid: "3" } ], reviewStatusList: [{ - name: "审核状态1", + name: "待审核", sid: "1" }, { - name: "审核状态2", + name: "审核通过", sid: "2" + }, + { + name: "审核拒绝", + sid: "3" } ] } @@ -354,14 +370,14 @@ return } - // if(this.selectionList[0].checkState!=1){ - // this.$message({ - // type: 'warning', - // message: "此记录已完成,不可重复操作。", - // showClose: true - // }) - // return - // } + if(this.selectionList[0].billState=='已收货'){ + this.$message({ + type: 'warning', + message: "此记录已完成,不可重复操作。", + showClose: true + }) + return + } this.viewState = 2 this.$refs['divadd'].showEdit(this.selectionList[0]) diff --git a/yxt-as-ui/src/views/storage/receivingGoods/index.vue b/yxt-as-ui/src/views/storage/receivingGoods/index.vue index c0650af54d..ee5433a9e3 100644 --- a/yxt-as-ui/src/views/storage/receivingGoods/index.vue +++ b/yxt-as-ui/src/views/storage/receivingGoods/index.vue @@ -67,12 +67,12 @@ - + @@ -173,23 +173,28 @@ sids: [], selectionList: [], busTypeList: [{ - name: "业务类型1", + name: "采购预约", + sid: "0" + }, + { + name: "调拨预约", sid: "1" }, { - name: "业务类型2", + name: "其他预约", sid: "2" } ], - billStateList: [{ - name: "新建", - sid: "0" - }, - { - name: "完成", - sid: "1" - } - ], + billStateList: [{ + name: "新建", + sid: "0" + }, + { + name: "已完成", + sid: "1" + }, + + ], } }, mounted() { @@ -336,29 +341,30 @@ } }, toAdd() { - if (this.selectionList.length != 1) { - this.$message({ - type: 'warning', - message: "请选择一条数据。", - showClose: true - }) - return - } + if (this.selectionList.length != 1) { + this.$message({ + type: 'warning', + message: "请选择一条数据。", + showClose: true + }) + return + } - if (this.selectionList[0].billState == '完成') { - this.$message({ - type: 'warning', - message: "此记录已完成,不可操作。", - showClose: true - }) - return - } + if (this.selectionList[0].billState == '已完成') { + this.$message({ + type: 'warning', + message: "此记录已完成,不可操作。", + showClose: true + }) + return + } this.viewState = 5 this.$refs['divAddupShelfRecord'].showEdit(this.selectionList[0]) }, toEdit(row) { + this.viewState = 3 this.$refs['divadd'].showEdit(row) diff --git a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue index 1fdba27b0e..c532f81312 100644 --- a/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue +++ b/yxt-as-ui/src/views/storage/receivingGoods/upShelfAddRecord.vue @@ -20,15 +20,15 @@
基础信息
- -
单据编号
- {{ formobj.billNo }} +
制单人
+ + {{ formobj.createByName }} + -
制单人
- +
制单部门
+ {{ formobj.deptName }}
* 单据日期
@@ -51,8 +51,8 @@
* 上架人
- + @@ -82,10 +82,10 @@ 删除 - + - - + + - +