From 493bca6c1beb3c2b612d72ba8110e1bc0c172e99 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 25 Jun 2024 18:19:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9B=98=E7=82=B9=E3=80=81=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E5=BC=80=E5=8F=91=E8=B0=83=E6=95=B4=E3=80=81=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanHomevisitInvestigateService.java | 22 ++++++------ .../wmsinventory/WmsInventoryMapper.xml | 6 ++-- .../WmsInventoryAllocateBill.java | 4 +++ .../WmsInventoryAllocateBillDetailsVoNew.java | 14 ++++---- .../WmsInventoryAllocateBillDtoNew.java | 16 ++++----- .../WmsInventoryAllocateBillMapper.java | 6 ++++ .../WmsInventoryAllocateBillMapper.xml | 11 ++++++ .../WmsInventoryAllocateBillService.java | 30 +++++++++++++--- .../WmsInventoryAllocateBillVoNew.java | 4 +-- .../WmsInventoryAllocateBillDetail.java | 2 ++ .../WmsInventoryAllocateBillDetailMapper.java | 2 +- .../WmsInventoryAllocateBillDetailMapper.xml | 10 +++++- ...WmsInventoryAllocateBillDetailService.java | 8 +++++ .../WmsInventoryCheckbill.java | 7 +++- .../WmsInventoryCheckbillDetailsVo.java | 4 +++ .../WmsInventoryCheckbillDto.java | 4 +++ .../WmsInventoryCheckbillMapper.java | 6 ++++ .../WmsInventoryCheckbillMapper.xml | 8 +++++ .../WmsInventoryCheckbillService.java | 34 +++++++++++++----- .../WmsInventoryCheckbillDetail.java | 36 +++++++++++++++---- .../WmsInventoryCheckbillDetailDetailsVo.java | 8 ++--- .../WmsInventoryCheckbillDetailDto.java | 8 ++--- .../WmsInventoryCheckbillDetailMapper.xml | 8 ++--- .../WmsInventoryCheckbillDetailService.java | 4 +++ 24 files changed, 198 insertions(+), 64 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java index cb9be211de..8272b3b0f1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateService.java @@ -1669,16 +1669,18 @@ public class LoanHomevisitInvestigateService extends MybatisBaseService wmsInventoryAllocateBillDetailNewList; - - /* - * 页面展示 - * */ - @ApiModelProperty("调出分公司名称") - private String outOrgName; - @ApiModelProperty("调入分公司名称") - private String inOrgName; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java index cdf396b410..60e43168d9 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java @@ -21,6 +21,8 @@ public class WmsInventoryAllocateBillDtoNew implements Dto { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("制单日期") + private String createDate; @ApiModelProperty("制单人sid") private String createBySid; @ApiModelProperty("制单人姓名") @@ -29,8 +31,12 @@ public class WmsInventoryAllocateBillDtoNew implements Dto { private String billNo; @ApiModelProperty("调出分公司sid") private String outOrgSid; + @ApiModelProperty("调出分公司sid") + private String outOrgName; @ApiModelProperty("调入分公司sid") private String inOrgSid; + @ApiModelProperty("调入分公司sid") + private String inOrgName; @ApiModelProperty("调拨数量") private BigDecimal count; @ApiModelProperty("调拨金额") @@ -46,14 +52,8 @@ public class WmsInventoryAllocateBillDtoNew implements Dto { private String useOrgSid; @ApiModelProperty("创建组织sid") private String createOrgSid; + @ApiModelProperty("创建组织") + private String createOrgName; @ApiModelProperty("调拨单商品明细") private List wmsInventoryAllocateBillDetailNewList; - - /* - * 页面展示 - * */ - @ApiModelProperty("调出分公司名称") - private String outOrgName; - @ApiModelProperty("调入分公司名称") - private String inOrgName; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java index 4fe6bdc32e..0deaaf1152 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; /** * @author wangpengfei @@ -17,4 +18,9 @@ public interface WmsInventoryAllocateBillMapper extends BaseMapper selectPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + String selectNum(String billNo); + + @Update("update wms_inventory_allocate_bill set state = '2',finishTime = NOW() where sid = #{sid}") + void updateState(String sid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml index 19517a608d..d6082525cf 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillMapper.xml @@ -23,6 +23,17 @@ + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index 609e0a00b5..6a2e5e56e1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsinventoryallocatebill; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; @@ -13,6 +14,9 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew; import com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailService; import com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.utils.Rule; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +32,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); @@ -157,23 +163,38 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList(); if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); + billNo = "DB" + sysOrganizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); + dto.setCreateDate(DateUtil.today()); + dto.setCreateOrgName(sysOrganizationVo.getName()); String sid = this.insertByDto(dto); for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { wmsInventoryAllocateBillDetailDtoNew.setBillSid(sid); wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew); } - return; + return sid; } this.updateByDto(dto); wmsInventoryAllocateBillDetailService.delByMainSid(dtoSid); for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { wmsInventoryAllocateBillDetailDtoNew.setBillSid(dtoSid); - wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew); + wmsInventoryAllocateBillDetailService.insertByDto(wmsInventoryAllocateBillDetailDtoNew); } + return dtoSid; } public String insertByDto(WmsInventoryAllocateBillDtoNew dto) { @@ -191,6 +212,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); WmsInventoryAllocateBillDetailVo initialization (@Param("sid") String sid); - @Delete("delete from wms_inventory_allocatebill_detail where billSid = #{billSid}") + @Delete("delete from wms_inventory_allocate_bill_detail where billSid = #{billSid}") void delByMainSid(String billSid); List selByMainSid(String billSid); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml index 17f4650950..82db7405a2 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.xml @@ -25,12 +25,20 @@ resultType="com.yxt.wms.biz.inventory.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew"> SELECT wiad.*, + wiad.outWarehouseSid as warehouseSid, + wiad.outWarehouseName as warehouseName, + wiad.warehouseAreasid as warehouseRackSid, + wiad.warehouseArea as warehouseRackCode, + wiad.inWarehouseSid as inWarehouseSid, + wiad.inWarehouseName as inWarehouseName, + wiad.warehouseRackSid as inWarehouseRackSid, + wiad.warehouseRackCode as inWarehouseRackCode, wi.goodsSpuName, wi.goodsSkuCode, wi.goodsSkuOwnSpec, wi.unit FROM - wms_inventory_allocatebill_detail wiad + wms_inventory_allocate_bill_detail wiad LEFT JOIN wms_inventory wi ON wiad.inventorySid = wi.`sid` WHERE billSid = #{billSid} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java index 0ffb6f792b..3bb9ce9b9a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java @@ -145,6 +145,14 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService selectListVo(); + + String selectNum(String billNo); + + @Update("update wms_inventory_checkbill set checkState = '2',completeDate = NOW() where sid = #{sid}") + void updateCheckState(String sid); } \ 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 f0ea6ba867..57ebc81dc9 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 @@ -10,4 +10,12 @@ + + \ 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 52dbab7ee6..7b2bd76446 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 @@ -26,11 +26,15 @@ package com.yxt.wms.biz.inventory.wmsinventorycheckbill; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.utils.Rule; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -61,6 +65,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryCheckbillQuery query = pq.getParams(); @@ -87,23 +93,38 @@ public class WmsInventoryCheckbillService extends MybatisBaseService wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList(); if (StringUtils.isBlank(dtoSid)) { + //生成单据编号 + String billNo = ""; + String date = DateUtil.format(DateUtil.date(), "yyyyMM"); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData(); + billNo = "PD" + sysOrganizationVo.getOrgCode() + date; + String i = baseMapper.selectNum(billNo); + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(billNo, 0); + } + dto.setBillNo(billNo); + dto.setCreateDate(DateUtil.today()); + dto.setCreateOrgName(sysOrganizationVo.getName()); String sid = this.insertByDto(dto); for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { wmsInventoryCheckbillDetailDto.setBillSid(sid); wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto); } - return; + return sid; } this.updateByDto(dto); wmsInventoryCheckbillDetailService.delByMainSid(dtoSid); for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { wmsInventoryCheckbillDetailDto.setBillSid(dtoSid); - wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto); + wmsInventoryCheckbillDetailService.insertByDto(wmsInventoryCheckbillDetailDto); } + return dtoSid; } public String insertByDto(WmsInventoryCheckbillDto dto){ @@ -133,10 +154,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList(); - for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) { - - } + String sid = saveOrUpdateDto(dto); + baseMapper.updateCheckState(sid); } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java index 16855d8d01..84d5ef13ab 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java @@ -53,16 +53,34 @@ public class WmsInventoryCheckbillDetail extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty("盘点单sid") - private String billSid; // 盘点单sid + private String billSid; @ApiModelProperty("商品库存sid") - private String inventorySid; // 商品库存sid + private String inventorySid; + @ApiModelProperty("商品sid") + private String goodsSid; + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("商品编码（图号）") + private String goodsCode; + @ApiModelProperty("型号") + private String goodsModel; + @ApiModelProperty("单价") + private BigDecimal cost; + @ApiModelProperty("单位") + private String unit; @ApiModelProperty("仓库sid") - private String warehouseSid; // 仓库sid - @ApiModelProperty("仓库") - private String warehouseName; // 仓库 - @ApiModelProperty("库位sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseArea; + @ApiModelProperty("货架sid") private String warehouseRackSid; - @ApiModelProperty("库位编码") + @ApiModelProperty("货架名称") + private String warehouseRackName; + @ApiModelProperty("货架编码") private String warehouseRackCode; @ApiModelProperty("含税价") private BigDecimal taxPrice; // 含税价 @@ -70,6 +88,10 @@ public class WmsInventoryCheckbillDetail extends BaseEntity { private BigDecimal bookCount; // 账面数量 @ApiModelProperty("实盘数量") private BigDecimal realCount; // 实盘数量 + @ApiModelProperty("盈亏数（实盘数量-账面数量）") + private BigDecimal profitandlossNumber; + @ApiModelProperty("盈亏金额（盈亏数*含税价）") + private BigDecimal profitandlossAmount; @ApiModelProperty("现场照片（多张中间用英文逗号分隔）") private String picUrl; // 现场照片（多张中间用英文逗号分隔） diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java index 2ec6ded503..1451c8a805 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java @@ -83,9 +83,8 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo { @ApiModelProperty("现场照片") private List picUrls = new ArrayList<>(); - /* - * 页面展示字段 - * */ + @ApiModelProperty("商品sid") + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("零件号") @@ -94,7 +93,8 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo { private String carModel; @ApiModelProperty("商品单位") private String unit; - + @ApiModelProperty("单价") + private String cost; /* * 盘点接口需要字段 * */ diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java index 254457b5a1..83a2a089ca 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java @@ -83,9 +83,8 @@ public class WmsInventoryCheckbillDetailDto implements Dto { @ApiModelProperty("现场照片") private List picUrls = new ArrayList<>(); - /* - * 页面展示字段 - * */ + @ApiModelProperty("商品sid") + private String goodsSpuSid; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("零件号") @@ -94,7 +93,8 @@ public class WmsInventoryCheckbillDetailDto implements Dto { private String carModel; @ApiModelProperty("商品单位") private String unit; - + @ApiModelProperty("单价") + private String cost; /* * 盘点接口需要字段 * */ 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 c6e96f52ce..962b7e83e3 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 @@ -15,10 +15,10 @@ resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo"> SELECT wicd.*, - wi.goodsSpuName, - wi.goodsSkuCode, - wi.goodsSkuOwnSpec, - wi.unit + wicd.goodsModel as carModel, + wicd.goodsSid as goodsSpuSid, + wicd.goodsName as goodsSpuName, + wicd.goodsCode as goodsSkuCode FROM wms_inventory_checkbill_detail wicd LEFT JOIN wms_inventory wi 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 c981ef26bd..71027db3c0 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 @@ -75,6 +75,10 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService Date: Tue, 25 Jun 2024 18:22:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9B=98=E7=82=B9=20?= =?UTF-8?q?=E8=B0=83=E6=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/Common/dictcommons.js | 10 ++ yxt-as-ui/src/api/storage/allocation.js | 12 +- yxt-as-ui/src/api/storage/stocktaking.js | 6 +- .../storage/allocation/allocationAdd.vue | 157 +++++++++++------- .../src/views/storage/allocation/index.vue | 21 ++- .../src/views/storage/stocktaking/index.vue | 2 +- .../storage/stocktaking/stocktakingAdd.vue | 99 +++++++---- 7 files changed, 207 insertions(+), 100 deletions(-) diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 59fdd096e5..505aa1fab1 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -17,6 +17,16 @@ export function getTypeValueList(data) { }) } +// 获取所有分公司 +export function selectOrgSidList(data) { + return request({ + url: '/portal/v1/sysorganization/selectOrgSidList', + method: 'get', + params: data + }) +} + + // 根据当前登录人orgSidPath(全路径sid)查询分公司 export function getOrgSidByPath(data) { return request({ diff --git a/yxt-as-ui/src/api/storage/allocation.js b/yxt-as-ui/src/api/storage/allocation.js index 35883a698a..d36b8585ef 100644 --- a/yxt-as-ui/src/api/storage/allocation.js +++ b/yxt-as-ui/src/api/storage/allocation.js @@ -25,11 +25,21 @@ export default { // 初始化 init: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/' + data, + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/fetchDetailsBySid/' + data, method: 'get' }); }, + // 调拨 + allocation: function(data) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventoryallocatebill/allocation', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }); + }, + // 查询所有商品 getGoods: function(params) { diff --git a/yxt-as-ui/src/api/storage/stocktaking.js b/yxt-as-ui/src/api/storage/stocktaking.js index 282f49f608..c78fcbe11d 100644 --- a/yxt-as-ui/src/api/storage/stocktaking.js +++ b/yxt-as-ui/src/api/storage/stocktaking.js @@ -14,7 +14,7 @@ export default { // 新增、保存 save: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventorycheckbill/save', + url: '/wms/v1/wmsinventorycheckbill/save', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -24,7 +24,7 @@ export default { // 初始化 init: function(data) { return request({ - url: '/wms/apiadmin/inventory/wmsinventorycheckbill/' + data, + url: '/wms/v1/wmsinventorycheckbill/fetchDetailsBySid/' + data, method: 'get' }); }, @@ -42,7 +42,7 @@ export default { // 盘点 inven: function(params) { return request({ - url: '/wms/apiadmin/inventory/wmsinventory/invenGoodsListPage', + url: '/wms/v1/wmsinventorycheckbill/inven', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } diff --git a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue index c4b60d434f..cb394b045a 100644 --- a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue +++ b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue @@ -5,7 +5,7 @@
{{ viewTitle }}
保存 - 调拨 + 调拨 关闭
@@ -70,20 +70,20 @@ - - + + - + - +