From cfcfbb57c4d2fd57c7b085cfd246b16670a2ed00 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Mon, 15 Sep 2025 14:33:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockindetail/domain/InStockinDetail.java | 20 +- .../domain/InStockinDetailFinish.java | 368 ++---------------- .../mydojobdetail/domain/MydoJobDetail.java | 361 ++--------------- .../mapper/in/InStockinDetailFinishMapper.xml | 17 +- .../mapper/in/InStockinDetailMapper.xml | 28 +- .../mapper/job/MydoJobDetailFinishMapper.xml | 161 +++++--- .../mapper/job/MydoJobDetailMapper.xml | 165 +++++--- ruoyi-ui/src/views/in/job/index.vue | 38 +- ruoyi-ui/src/views/in/stockIn/index.vue | 17 +- 9 files changed, 353 insertions(+), 822 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java index 070b4cc..7a20124 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java @@ -44,6 +44,8 @@ public class InStockinDetail extends BaseEntity /** 物料编码 */ @Excel(name = "物料编码") private String productId; + @Excel(name = "物料名称") + private String productName; /** 计划数量 */ @Excel(name = "计划数量") @@ -109,28 +111,34 @@ public class InStockinDetail extends BaseEntity private String spec; /** 备用字段1 */ - @Excel(name = "备用字段1") + @Excel(name = "型号") private String spare1; /** 备用字段2 */ - @Excel(name = "备用字段2") + @Excel(name = "净重") private String spare2; /** 备用字段3 */ - @Excel(name = "备用字段3") + @Excel(name = "颜色") private String spare3; /** 备用字段4 */ - @Excel(name = "备用字段4") + @Excel(name = "序列号") private String spare4; /** 备用字段5 */ - @Excel(name = "备用字段5") + @Excel(name = "电压") private String spare5; /** 备用字段6 */ - @Excel(name = "备用字段6") + @Excel(name = "功率") private String spare6; + @Excel(name = "相位") + private String spare7; + @Excel(name = "毛重") + private String spare8; + + private String spare9; private String status; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java index c3e2c5e..7ce13d0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockindetailfinish/domain/InStockinDetailFinish.java @@ -2,6 +2,10 @@ package com.ruoyi.in.stockindetailfinish.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.common.domain.ExtraField; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +15,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2025-05-28 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class InStockinDetailFinish extends BaseEntity { private static final long serialVersionUID = 1L; @@ -58,6 +65,13 @@ public class InStockinDetailFinish extends BaseEntity @Excel(name = "品牌") private String cargoNo; + @Excel(name = "扫码数量") + private String scanNum; + @Excel(name = "扫码数量(箱)") + private String scanNumX; + @Excel(name = "扫码数量(件)") + private String scanNumJ; + /** 实际数量 */ @Excel(name = "实际数量") private String assignNum; @@ -95,364 +109,40 @@ public class InStockinDetailFinish extends BaseEntity private String spec; /** 备用字段1 */ - @Excel(name = "备用字段1") + @Excel(name = "型号") private String spare1; /** 备用字段2 */ - @Excel(name = "备用字段2") + @Excel(name = "净重") private String spare2; /** 备用字段3 */ - @Excel(name = "备用字段3") + @Excel(name = "颜色") private String spare3; /** 备用字段4 */ - @Excel(name = "备用字段4") + @Excel(name = "序列号") private String spare4; /** 备用字段5 */ - @Excel(name = "备用字段5") + @Excel(name = "电压") private String spare5; /** 备用字段6 */ - @Excel(name = "备用字段6") + @Excel(name = "功率") private String spare6; + @Excel(name = "相位") + private String spare7; + @Excel(name = "毛重") + private String spare8; - /** 扫码数量 */ - @Excel(name = "扫码数量") - private String scanNum; + private String spare9; - /** 扫码数量(箱) */ - @Excel(name = "扫码数量(箱)") - private String scanNumX; + private String status; - /** 扫码数量(件) */ - @Excel(name = "扫码数量(件)") - private String scanNumJ; + private ExtraField extraField; - public void setStockinDetailId(String stockinDetailId) - { - this.stockinDetailId = stockinDetailId; - } + private String warehouseName; - public String getStockinDetailId() - { - return stockinDetailId; - } - - public void setStockinGuid(String stockinGuid) - { - this.stockinGuid = stockinGuid; - } - - public String getStockinGuid() - { - return stockinGuid; - } - - public void setStockinId(String stockinId) - { - this.stockinId = stockinId; - } - - public String getStockinId() - { - return stockinId; - } - - public void setLotNo(String lotNo) - { - this.lotNo = lotNo; - } - - public String getLotNo() - { - return lotNo; - } - - public void setProductGuid(String productGuid) - { - this.productGuid = productGuid; - } - - public String getProductGuid() - { - return productGuid; - } - - public void setProductId(String productId) - { - this.productId = productId; - } - - public String getProductId() - { - return productId; - } - - public void setQuantity(String quantity) - { - this.quantity = quantity; - } - - public String getQuantity() - { - return quantity; - } - - public void setQuantityX(String quantityX) - { - this.quantityX = quantityX; - } - - public String getQuantityX() - { - return quantityX; - } - - public void setQuantityJ(String quantityJ) - { - this.quantityJ = quantityJ; - } - - public String getQuantityJ() - { - return quantityJ; - } - - public void setPrice(String price) - { - this.price = price; - } - - public String getPrice() - { - return price; - } - - public void setCargoNo(String cargoNo) - { - this.cargoNo = cargoNo; - } - - public String getCargoNo() - { - return cargoNo; - } - - public void setAssignNum(String assignNum) - { - this.assignNum = assignNum; - } - - public String getAssignNum() - { - return assignNum; - } - - public void setAssignNumX(String assignNumX) - { - this.assignNumX = assignNumX; - } - - public String getAssignNumX() - { - return assignNumX; - } - - public void setAssignNumJ(String assignNumJ) - { - this.assignNumJ = assignNumJ; - } - - public String getAssignNumJ() - { - return assignNumJ; - } - - public void setPrintDate(String printDate) - { - this.printDate = printDate; - } - - public String getPrintDate() - { - return printDate; - } - - public void setStockStatus(String stockStatus) - { - this.stockStatus = stockStatus; - } - - public String getStockStatus() - { - return stockStatus; - } - - public void setSupplierId(String supplierId) - { - this.supplierId = supplierId; - } - - public String getSupplierId() - { - return supplierId; - } - - public void setCustomerId(String customerId) - { - this.customerId = customerId; - } - - public String getCustomerId() - { - return customerId; - } - - public void setUnit(String unit) - { - this.unit = unit; - } - - public String getUnit() - { - return unit; - } - - public void setSpec(String spec) - { - this.spec = spec; - } - - public String getSpec() - { - return spec; - } - - public void setSpare1(String spare1) - { - this.spare1 = spare1; - } - - public String getSpare1() - { - return spare1; - } - - public void setSpare2(String spare2) - { - this.spare2 = spare2; - } - - public String getSpare2() - { - return spare2; - } - - public void setSpare3(String spare3) - { - this.spare3 = spare3; - } - - public String getSpare3() - { - return spare3; - } - - public void setSpare4(String spare4) - { - this.spare4 = spare4; - } - - public String getSpare4() - { - return spare4; - } - - public void setSpare5(String spare5) - { - this.spare5 = spare5; - } - - public String getSpare5() - { - return spare5; - } - - public void setSpare6(String spare6) - { - this.spare6 = spare6; - } - - public String getSpare6() - { - return spare6; - } - - public void setScanNum(String scanNum) - { - this.scanNum = scanNum; - } - - public String getScanNum() - { - return scanNum; - } - - public void setScanNumX(String scanNumX) - { - this.scanNumX = scanNumX; - } - - public String getScanNumX() - { - return scanNumX; - } - - public void setScanNumJ(String scanNumJ) - { - this.scanNumJ = scanNumJ; - } - - public String getScanNumJ() - { - return scanNumJ; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("stockinDetailId", getStockinDetailId()) - .append("stockinGuid", getStockinGuid()) - .append("stockinId", getStockinId()) - .append("lotNo", getLotNo()) - .append("productGuid", getProductGuid()) - .append("productId", getProductId()) - .append("quantity", getQuantity()) - .append("quantityX", getQuantityX()) - .append("quantityJ", getQuantityJ()) - .append("price", getPrice()) - .append("cargoNo", getCargoNo()) - .append("remark", getRemark()) - .append("assignNum", getAssignNum()) - .append("assignNumX", getAssignNumX()) - .append("assignNumJ", getAssignNumJ()) - .append("printDate", getPrintDate()) - .append("stockStatus", getStockStatus()) - .append("supplierId", getSupplierId()) - .append("customerId", getCustomerId()) - .append("unit", getUnit()) - .append("spec", getSpec()) - .append("spare1", getSpare1()) - .append("spare2", getSpare2()) - .append("spare3", getSpare3()) - .append("spare4", getSpare4()) - .append("spare5", getSpare5()) - .append("spare6", getSpare6()) - .append("scanNum", getScanNum()) - .append("scanNumX", getScanNumX()) - .append("scanNumJ", getScanNumJ()) - .toString(); - } + private String warehouseId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java index 5eb2b01..747f192 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java @@ -3,6 +3,9 @@ package com.ruoyi.job.mydojobdetail.domain; import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.domain.ExtraField; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -12,6 +15,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author ruoyi * @date 2025-05-22 */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class MydoJobDetail extends BaseEntity { private static final long serialVersionUID = 1L; @@ -105,19 +111,19 @@ public class MydoJobDetail extends BaseEntity private String supplierId; /** 备用字段1 */ - @Excel(name = "备用字段1") + @Excel(name = "型号") private String spare1; /** 备用字段2 */ - @Excel(name = "备用字段2") + @Excel(name = "净重") private String spare2; /** 备用字段3 */ - @Excel(name = "备用字段3") + @Excel(name = "颜色") private String spare3; /** 备用字段4 */ - @Excel(name = "备用字段4") + @Excel(name = "序列号") private String spare4; private String status; @@ -128,336 +134,23 @@ public class MydoJobDetail extends BaseEntity private String pickQuantityReal; //绑定容器物品数量 private String pickBindQuantity; + /** 备用字段4 */ + @Excel(name = "电压") + private String spare5; + /** 备用字段4 */ + @Excel(name = "功率") + private String spare6; + /** 备用字段4 */ + @Excel(name = "相位") + private String spare7; + /** 备用字段4 */ + @Excel(name = "毛重") + private String spare8; + /** 备用字段4 */ + private String spare9; + /** 备用字段4 */ + @Excel(name = "规格") + private String spec; - public String getPickBindQuantity() { - return pickBindQuantity; - } - public void setPickBindQuantity(String pickBindQuantity) { - this.pickBindQuantity = pickBindQuantity; - } - - public String getPickQuantityReal() { - return pickQuantityReal; - } - - public void setPickQuantityReal(String pickQuantityReal) { - this.pickQuantityReal = pickQuantityReal; - } - - public String getPickQuantity() { - return pickQuantity; - } - - public void setPickQuantity(String pickQuantity) { - this.pickQuantity = pickQuantity; - } - - public ExtraField getExtraField() { - return extraField; - } - - public void setExtraField(ExtraField extraField) { - this.extraField = extraField; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public void setJobDetailId(String jobDetailId) - { - this.jobDetailId = jobDetailId; - } - - public String getJobDetailId() - { - return jobDetailId; - } - - public void setJobId(String jobId) - { - this.jobId = jobId; - } - - public String getJobId() - { - return jobId; - } - - public void setStockId(String stockId) - { - this.stockId = stockId; - } - - public String getStockId() - { - return stockId; - } - - public void setLotNo(String lotNo) - { - this.lotNo = lotNo; - } - - public String getLotNo() - { - return lotNo; - } - - public void setInDate(String inDate) - { - this.inDate = inDate; - } - - public String getInDate() - { - return inDate; - } - - public void setInOrOutId(String inOrOutId) - { - this.inOrOutId = inOrOutId; - } - - public String getInOrOutId() - { - return inOrOutId; - } - - public void setInOrOutDId(String inOrOutDId) - { - this.inOrOutDId = inOrOutDId; - } - - public String getInOrOutDId() - { - return inOrOutDId; - } - - public void setProductGuid(String productGuid) - { - this.productGuid = productGuid; - } - - public String getProductGuid() - { - return productGuid; - } - - public void setProductId(String productId) - { - this.productId = productId; - } - - public String getProductId() - { - return productId; - } - - public void setStockStatus(String stockStatus) - { - this.stockStatus = stockStatus; - } - - public String getStockStatus() - { - return stockStatus; - } - - public void setInQuantity(String inQuantity) - { - this.inQuantity = inQuantity; - } - - public String getInQuantity() - { - return inQuantity; - } - - public void setStockQuantity(String stockQuantity) - { - this.stockQuantity = stockQuantity; - } - - public String getStockQuantity() - { - return stockQuantity; - } - - public void setOutQuantity(String outQuantity) - { - this.outQuantity = outQuantity; - } - - public String getOutQuantity() - { - return outQuantity; - } - - public void setLayerQuantity(String layerQuantity) - { - this.layerQuantity = layerQuantity; - } - - public String getLayerQuantity() - { - return layerQuantity; - } - - public void setOutLayerQuantity(String outLayerQuantity) - { - this.outLayerQuantity = outLayerQuantity; - } - - public String getOutLayerQuantity() - { - return outLayerQuantity; - } - - public void setGiveNum(String giveNum) - { - this.giveNum = giveNum; - } - - public String getGiveNum() - { - return giveNum; - } - - public void setStockinId(String stockinId) - { - this.stockinId = stockinId; - } - - public String getStockinId() - { - return stockinId; - } - - public void setStackingId(String stackingId) - { - this.stackingId = stackingId; - } - - public String getStackingId() - { - return stackingId; - } - - public void setExitId(String exitId) - { - this.exitId = exitId; - } - - public String getExitId() - { - return exitId; - } - - public void setPrintDate(String printDate) - { - this.printDate = printDate; - } - - public String getPrintDate() - { - return printDate; - } - - public void setCustomerId(String customerId) - { - this.customerId = customerId; - } - - public String getCustomerId() - { - return customerId; - } - - public void setSupplierId(String supplierId) - { - this.supplierId = supplierId; - } - - public String getSupplierId() - { - return supplierId; - } - - public void setSpare1(String spare1) - { - this.spare1 = spare1; - } - - public String getSpare1() - { - return spare1; - } - - public void setSpare2(String spare2) - { - this.spare2 = spare2; - } - - public String getSpare2() - { - return spare2; - } - - public void setSpare3(String spare3) - { - this.spare3 = spare3; - } - - public String getSpare3() - { - return spare3; - } - - public void setSpare4(String spare4) - { - this.spare4 = spare4; - } - - public String getSpare4() - { - return spare4; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("jobDetailId", getJobDetailId()) - .append("jobId", getJobId()) - .append("stockId", getStockId()) - .append("lotNo", getLotNo()) - .append("inDate", getInDate()) - .append("inOrOutId", getInOrOutId()) - .append("inOrOutDId", getInOrOutDId()) - .append("productGuid", getProductGuid()) - .append("productId", getProductId()) - .append("stockStatus", getStockStatus()) - .append("inQuantity", getInQuantity()) - .append("stockQuantity", getStockQuantity()) - .append("outQuantity", getOutQuantity()) - .append("layerQuantity", getLayerQuantity()) - .append("outLayerQuantity", getOutLayerQuantity()) - .append("giveNum", getGiveNum()) - .append("stockinId", getStockinId()) - .append("stackingId", getStackingId()) - .append("exitId", getExitId()) - .append("printDate", getPrintDate()) - .append("customerId", getCustomerId()) - .append("supplierId", getSupplierId()) - .append("spare1", getSpare1()) - .append("spare2", getSpare2()) - .append("spare3", getSpare3()) - .append("spare4", getSpare4()) - .toString(); - } } diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml index c75076e..faf7b44 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml @@ -32,9 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -64,10 +68,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - + + + select @@ -85,8 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, - bp.product_name, bp.spare1 as englishDesc, - bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + bp.product_name, + isd.spare7,isd.spare8,isd.spare9 from in_stockin_detail_finish isd left join bas_product bp on bp.product_id = isd.product_id diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml index 4821f63..cb44a1f 100644 --- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml @@ -32,21 +32,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + - - - - - - - - - - + + + + + + + + + + + @@ -56,8 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status, isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4, isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j, - bp.product_name, bp.spare1 as englishDesc, - bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume + bp.product_name, + isd.spare7,isd.spare8,isd.spare9 from in_stockin_detail isd left join bas_product bp on bp.product_id = isd.product_id diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml index bf9b4ba..d3f368b 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml @@ -32,55 +32,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - + + + + + + - - select mjd.job_detail_id, - mjd.job_id, - mjd.stock_id, - mjd.lot_no, - mjd.in_date, - mjd.in_or_out_id, - mjd.in_or_out_d_id, - mjd.product_guid, - mjd.product_id, - mjd.stock_status, - mjd.in_quantity, - mjd.stock_quantity, - mjd.out_quantity, - mjd.layer_quantity, - mjd.out_layer_quantity, - mjd.give_num, - mjd.stockin_id, - mjd.stacking_id, - mjd.exit_id, - mjd.print_date, - mjd.customer_id, - mjd.supplier_id, - mjd.spare1, - mjd.spare2, - mjd.spare3, - mjd.spare4, - mjd.pick_quantity, - bp.product_name, bp.spare1 as englishDesc, - bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume - - from mydo_job_detail_finish mjd - left join bas_product bp on mjd.product_id = bp.product_id - diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml index 1b73313..7b0cb5b 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml @@ -33,58 +33,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - + + + + + + - + - and mjd.job_detail_id = #{jobDetailId} and mjd.job_id = #{jobId} @@ -117,11 +112,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue index ca370fb..593fb4f 100644 --- a/ruoyi-ui/src/views/in/job/index.vue +++ b/ruoyi-ui/src/views/in/job/index.vue @@ -145,8 +145,7 @@ - - + @@ -158,21 +157,8 @@ - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + +