From ce6629929e828639080ebc71812f0f2adb02de89 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Tue, 8 Apr 2025 11:46:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A7=E4=BB=B6=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../as/api/asbusrepairbill/GoodsDetailsVo.java | 10 +++++++++- .../AsBusrepairInventorybillDetail.java | 9 +++++++++ .../AsBusrepairInventorybillDetailSDto.java | 11 +++++++++-- .../com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java | 9 +++++++++ .../sms/biz/smssalesbill/SmsSalesBillMapper.xml | 7 +++++-- .../sms/biz/smssalesbill/SmsSalesBillService.java | 14 ++++++-------- .../biz/smssalesbill/SmsWmsInventorySalesVo.java | 9 +++++++++ .../biz/smssalesbilldetail/SmsSalesBillDetail.java | 12 ++++++++---- .../wmsoldinventory/WmsOldInventoryService.java | 3 +++ .../wmsoutbill/WmsOutBillInventoryVo.java | 9 ++++++++- .../biz/inventory/wmsoutbill/WmsOutBillMapper.xml | 7 +++++++ 11 files changed, 82 insertions(+), 18 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java index e95b0726a2..885b6f0f95 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/GoodsDetailsVo.java @@ -4,7 +4,6 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -36,6 +35,15 @@ public class GoodsDetailsVo implements Vo { private String warehouseName; //库位编号 private String warehouseRackCode; + + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; // // @ApiModelProperty("需求数量（维修工单中）") // private String needCount; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java index 3cdb4db5c6..43c2b6b7bc 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetail.java @@ -112,4 +112,13 @@ public class AsBusrepairInventorybillDetail extends BaseEntity { private String billBusTypeKey; @ApiModelProperty("业务类型Value") private String billBusTypeValue; + + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java index fb8d9fdbf5..1efb1f098e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailSDto.java @@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * @description: * @author: dimengzhe @@ -48,6 +46,15 @@ public class AsBusrepairInventorybillDetailSDto { private String warehouseRackSid; @ApiModelProperty("库位编号") private String warehouseRackCode; + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; + @ApiModelProperty("需求数量") private String needCount; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java index c3f3152557..97761802a7 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesGoodsVo.java @@ -43,6 +43,15 @@ public class SalesGoodsVo { @ApiModelProperty("商品ID") private String goodsID; // 商品ID + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; + //规格型号 private String goodsSkuOwnSpec; //仓库Sid diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml index 25ba9d0967..a8b6119d80 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml @@ -115,8 +115,10 @@ i.supplierSid as billObjSid, i.warehouseSid, i.warehouseName, - wa.sid as areaSid, - wa.areaName, + wa.sid as wareAreaSid, + wa.areaName wareAreaName, + wz.sid wareZoneSid, + wz.zoneName wareZoneName, i.warehouseRackSid, i.warehouseRackCode, IF( IFNULL(i.taxRate,0) > 0, '0', '1' ) AS isTaxRate, @@ -128,6 +130,7 @@ LEFT JOIN yxt_wms.wms_warehouse_rack as ra ON ra.sid = i.warehouseRackSid LEFT JOIN yxt_wms.wms_warehouse_area as wa ON ra.locationSid = wa.sid LEFT JOIN yxt_wms.wms_warehouse_info as wi ON wi.sid = i.warehouseSid + LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = ra.zoneSid LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = i.goodsID ${ew.sqlSegment} diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java index 0cb24eab65..968b2e7573 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java @@ -409,6 +409,12 @@ public class SmsSalesBillService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.oldPageList(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java index 3684ec0db5..a95affa0f0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoutbill/WmsOutBillInventoryVo.java @@ -36,7 +36,14 @@ public class WmsOutBillInventoryVo { private String warehouseRackSid; @ApiModelProperty("库位编码") private String warehouseRackCode; - + @ApiModelProperty("库区sid") + private String wareAreaSid; + @ApiModelProperty("库区名称") + private String wareAreaName; + @ApiModelProperty("区域sid") + private String wareZoneSid; + @ApiModelProperty("区域名称") + private String wareZoneName; private String price;//销售单价 private String cost;//入库单价 private String outboundCount;// 已出库数量 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 7911d86600..73968f0ae0 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 @@ -43,6 +43,10 @@ wi.warehouseName, wi.warehouseRackSid, wi.warehouseRackCode, + wa.sid wareAreaSid, + wa.areaName wareAreaName, + wz.sid wareZoneSid, + wz.zoneName wareZoneName, wi.count, wi.sid inventorySid, wi.supplierName, @@ -50,6 +54,9 @@ s.price as money from wms_inventory wi LEFT JOIN yxt_wms.wms_warehouse_info as wh ON wh.sid = wi.warehouseSid + LEFT JOIN yxt_wms.wms_warehouse_rack as wr ON wr.sid = wi.warehouseRackSid + LEFT JOIN yxt_wms.wms_warehouse_area as wa ON wa.sid = wr.locationSid + LEFT JOIN yxt_wms.wms_warehouse_zone as wz ON wz.sid = wr.zoneSid LEFT JOIN yxt_sms.sms_goods as s ON s.goodsID = wi.goodsID ${ew.sqlSegment}