修改入库管理显示

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;
 

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;
 
-    /** 扫码数量 */
+    private String spare9;
-    @Excel(name = "扫码数量")
-    private String scanNum;
 
-    /** 扫码数量(箱) */
+    private String status;
-    @Excel(name = "扫码数量(箱)")
-    private String scanNumX;
 
-    /** 扫码数量(件) */
+    private ExtraField extraField;
-    @Excel(name = "扫码数量(件)")
-    private String scanNumJ;
 
-    public void setStockinDetailId(String stockinDetailId)
+    private String warehouseName;
-    {
-        this.stockinDetailId = stockinDetailId;
-    }
 
-    public String getStockinDetailId()
+    private String warehouseId;
-    {
-        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();
-    }
 }

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();
-    }
 }

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml

@@ -32,9 +32,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
         <result property="scanNum"    column="scan_num"    />
         <result property="scanNumX"    column="scan_num_x"    />
         <result property="scanNumJ"    column="scan_num_j"    />
+
     </resultMap>
     <resultMap type="InStockinDetail" id="InStockinDetailResult">
         <result property="stockinDetailId"    column="stockin_detail_id"    />
@@ -64,10 +68,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
         <result property="scanNum"    column="scan_num"    />
         <result property="scanNumX"    column="scan_num_x"    />
         <result property="scanNumJ"    column="scan_num_j"    />
-        <association property="extraField" javaType="ExtraField">
+        <result property="productName"    column="product_name"    />
+
+        <!--<association property="extraField" javaType="ExtraField">
             <result property="productId"    column="product_id"    />
             <result property="materialDesc"    column="product_name"    />
             <result property="englishDesc"    column="englishDesc"    />
@@ -76,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="height"    column="height"    />
             <result property="volume"    column="volume"    />
             <result property="netWeight"    column="netWeight"    />
-        </association>
+        </association>-->
     </resultMap>
     <sql id="selectInStockinDetailFinishVo">
         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.product_name,
-            bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+            isd.spare7,isd.spare8,isd.spare9
         from in_stockin_detail_finish isd
                  left join bas_product bp on bp.product_id = isd.product_id
     </sql>

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml

@@ -32,21 +32,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="spare5"    column="spare5"    />
         <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
         <result property="scanNum"    column="scan_num"    />
         <result property="scanNumX"    column="scan_num_x"    />
         <result property="scanNumJ"    column="scan_num_j"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="warehouseId"    column="warehouse_id"    />
-        <association property="extraField" javaType="ExtraField">
+        <result property="productName"    column="product_name"    />
-            <result property="productId"    column="product_id"    />
+<!--        <association property="extraField" javaType="ExtraField">-->
-            <result property="materialDesc"    column="product_name"    />
+<!--            <result property="productId"    column="product_id"    />-->
-            <result property="englishDesc"    column="englishDesc"    />
+<!--            <result property="materialDesc"    column="product_name"    />-->
-            <result property="length"    column="length"    />
+<!--            <result property="englishDesc"    column="englishDesc"    />-->
-            <result property="width"    column="width"    />
+<!--            <result property="length"    column="length"    />-->
-            <result property="height"    column="height"    />
+<!--            <result property="width"    column="width"    />-->
-            <result property="volume"    column="volume"    />
+<!--            <result property="height"    column="height"    />-->
-            <result property="netWeight"    column="netWeight"    />
+<!--            <result property="volume"    column="volume"    />-->
-        </association>
+<!--            <result property="netWeight"    column="netWeight"    />-->
+<!--        </association>-->
     </resultMap>
 
     <sql id="selectInStockinDetailVo">
@@ -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.product_name,
-            bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+            isd.spare7,isd.spare8,isd.spare9
         from in_stockin_detail isd
         left join bas_product bp on bp.product_id = isd.product_id
     </sql>

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailFinishMapper.xml

@@ -32,55 +32,52 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare3"    column="spare3"    />
         <result property="spare4"    column="spare4"    />
         <result property="pickQuantity"    column="pick_quantity"    />
-        <association property="extraField" javaType="ExtraField">
+        <result property="spare5"    column="spare5"    />
-            <result property="productId"    column="product_id"    />
+        <result property="spare6"    column="spare6"    />
-            <result property="materialDesc"    column="product_name"    />
+        <result property="spare7"    column="spare7"    />
-            <result property="englishDesc"    column="englishDesc"    />
+        <result property="spare8"    column="spare8"    />
-            <result property="length"    column="length"    />
+        <result property="spare9"    column="spare9"    />
-            <result property="width"    column="width"    />
+        <result property="spec"    column="spec"    />
-            <result property="height"    column="height"    />
-            <result property="volume"    column="volume"    />
-            <result property="netWeight"    column="netWeight"    />
-        </association>
     </resultMap>
 
-    <sql id="selectMydoJobDetailFinishVo">
-        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
-        </sql>
 
     <select id="selectMydoJobDetailFinishList" parameterType="MydoJobDetailFinish" resultMap="MydoJobDetailFinishResult">
-        <include refid="selectMydoJobDetailFinishVo"/>
+        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,
+        mjd.spare5,
+        mjd.spare6,
+        mjd.spare7,
+        mjd.spare8,
+        mjd.spare9,
+        mjd.spec
+        from mydo_job_detail_finish mjd
+        left join bas_product bp on mjd.product_id = bp.product_id
         <where>
             <if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
             <if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
@@ -112,12 +109,82 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMydoJobDetailFinishListByJobId" parameterType="String" resultMap="MydoJobDetailFinishResult">
-        <include refid="selectMydoJobDetailFinishVo"/>
+        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,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec
+        from mydo_job_detail_finish mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
         where job_id = #{jobId}
     </select>
 
     <select id="selectMydoJobDetailFinishByJobDetailId" parameterType="String" resultMap="MydoJobDetailFinishResult">
-        <include refid="selectMydoJobDetailFinishVo"/>
+        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,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec
+        from mydo_job_detail_finish mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
         where job_detail_id = #{jobDetailId}
     </select>
 

ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml

@@ -33,58 +33,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="pickQuantity"    column="pick_quantity"    />
         <result property="pickQuantityReal"    column="pick_quantity_real"    />
-        <association property="extraField" javaType="ExtraField">
+        <result property="spare5"    column="spare5"    />
-            <result property="productId"    column="product_id"    />
+        <result property="spare6"    column="spare6"    />
-            <result property="materialDesc"    column="product_name"    />
+        <result property="spare7"    column="spare7"    />
-            <result property="englishDesc"    column="englishDesc"    />
+        <result property="spare8"    column="spare8"    />
-            <result property="length"    column="length"    />
+        <result property="spare9"    column="spare9"    />
-            <result property="width"    column="width"    />
+        <result property="spec"    column="spec"    />
-            <result property="height"    column="height"    />
-            <result property="volume"    column="volume"    />
-            <result property="netWeight"    column="netWeight"    />
-        </association>
     </resultMap>
 
-    <sql id="selectMydoJobDetailVo">
+    <select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
         select mjd.job_detail_id,
-               mjd.job_id,
+        mjd.job_id,
-               mjd.stock_id,
+        mjd.stock_id,
-               mjd.lot_no,
+        mjd.lot_no,
-               mjd.in_date,
+        mjd.in_date,
-               mjd.in_or_out_id,
+        mjd.in_or_out_id,
-               mjd.in_or_out_d_id,
+        mjd.in_or_out_d_id,
-               mjd.product_guid,
+        mjd.product_guid,
-               mjd.product_id,
+        mjd.product_id,
-               mjd.stock_status,
+        mjd.stock_status,
-               mjd.in_quantity,
+        mjd.in_quantity,
-               mjd.stock_quantity,
+        mjd.stock_quantity,
-               mjd.out_quantity,
+        mjd.out_quantity,
-               mjd.layer_quantity,
+        mjd.layer_quantity,
-               mjd.out_layer_quantity,
+        mjd.out_layer_quantity,
-               mjd.give_num,
+        mjd.give_num,
-               mjd.stockin_id,
+        mjd.stockin_id,
-               mjd.stacking_id,
+        mjd.stacking_id,
-               mjd.exit_id,
+        mjd.exit_id,
-               mjd.print_date,
+        mjd.print_date,
-               mjd.customer_id,
+        mjd.customer_id,
-               mjd.supplier_id,
+        mjd.supplier_id,
-               mjd.spare1,
+        mjd.spare1,
-               mjd.spare2,
+        mjd.spare2,
-               mjd.spare3,
+        mjd.spare3,
-               mjd.spare4,
+        mjd.spare4,
-               mjd.pick_quantity,
+        mjd.pick_quantity,
-               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+        mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
-               bp.product_name, bp.spare1 as englishDesc,
+        bp.product_name,
-               bp.spare2 as netWeight,bp.spare5 as length,bp.spare6 as width,bp.spare7 as height,bp.spare8 as volume
+        mjd.spare5,
+        mjd.spare6,
+        mjd.spare7,
+        mjd.spare8,
+        mjd.spare9,
+        mjd.spec
 
         from mydo_job_detail mjd
         left join bas_product bp on mjd.product_id = bp.product_id
-
-
-    </sql>
-
-    <select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
-        <include refid="selectMydoJobDetailVo"/>
         <where>
             <if test="jobDetailId != null and jobDetailId != ''"> and mjd.job_detail_id = #{jobDetailId}</if>
             <if test="jobId != null and jobId != ''"> and mjd.job_id = #{jobId}</if>
@@ -117,11 +112,85 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectMydoJobDetailByJobDetailId" parameterType="String" resultMap="MydoJobDetailResult">
-        <include refid="selectMydoJobDetailVo"/>
+        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,
+               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+               bp.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec
+
+        from mydo_job_detail mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
         where job_detail_id = #{jobDetailId}
     </select>
     <select id="selectMydoJobDetailListByJobId" resultMap="MydoJobDetailResult">
-        <include refid="selectMydoJobDetailVo"/>
+        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,
+               mjd.out_quantity-mjd.pick_quantity as pick_quantity_real,
+               bp.product_name,
+               mjd.spare5,
+               mjd.spare6,
+               mjd.spare7,
+               mjd.spare8,
+               mjd.spare9,
+               mjd.spec
+
+        from mydo_job_detail mjd
+                 left join bas_product bp on mjd.product_id = bp.product_id
         where mjd.job_id = #{jobId}
     </select>
 

ruoyi-ui/src/views/in/job/index.vue

@@ -145,8 +145,7 @@
         </template>
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
-<!--      <el-table-column :label="$t('inJob.supplierName')" align="left" prop="supplierName" key="supplierId" value="supplierName" /> // 供应商-->
+      <el-table-column label="批号" align="left" prop="lotNo" fixed />
-<!--      <el-table-column :label="$t('inJob.departmentName')" align="left" prop="departmentName" /> // 部门-->
       <el-table-column label="托盘码" align="left" prop="trayCode" />
       <el-table-column label="货位" align="left" prop="cargoSpaceName" />
       <el-table-column label="优先级" align="left" prop="priority" />
@@ -158,21 +157,8 @@
       <el-table-column label="入口ID" align="left" prop="entranceId" />
       <el-table-column label="仓库" align="left" prop="warehouseName" />
       <el-table-column label="创建时间" align="left" prop="createTime" width="180"/>
-<!--        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>-->
       <el-table-column label="开始时间" align="left" prop="startTime" width="180"/>
-<!--        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>-->
       <el-table-column label="结束时间" align="left" prop="finishTime" width="180"/>
-<!--        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>-->
-
     </el-table>
 
     <pagination
@@ -192,19 +178,17 @@
       <el-table-column label="单据ID" align="left" prop="inOrOutId" />
       <el-table-column label="子单据ID" align="left" prop="inOrOutDId" />
       <el-table-column label="物料编码" align="left" prop="productId" />
-      <el-table-column label="物料描述" align="left" prop="extraField.materialDesc" />
+      <el-table-column label="物料名称" align="left" prop="productName" />
-      <el-table-column label="英文描述" align="left" prop="extraField.englishDesc" />
+      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
-      <el-table-column label="箱号" align="left" prop="extraField.cartonNo" />
+      <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
-      <el-table-column label="包装方式" align="left" prop="extraField.packingMethod" />
+      <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
-<!--      <el-table-column label="净重" align="right" width="120px" prop="extraField.netWeight" />-->
+      <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
-<!--      <el-table-column label="总净重" align="right" prop="extraField.totalNetWeight" />-->
+      <el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
-<!--      <el-table-column label="毛重" align="right" prop="extraField.grossWeight" />-->
+      <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
+      <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
+      <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
+      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
-<!--      <el-table-column :label="$t('inJob.inDate')" align="left" prop="inDate" width="180"> // 入库时间-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.inDate, '{y}-{m}-{d}') }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
     </el-table>
 
     <pagination

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -155,14 +155,21 @@
       <el-table-column label="子单ID" align="left" prop="stockinDetailId"/><!--子单ID-->
       <el-table-column label="主单ID" align="left" prop="stockinId"/><!--主单ID-->
       <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
-      <el-table-column label="物料描述" align="left" prop="extraField.materialDesc"/><!--物料描述-->
+      <el-table-column label="物料名称" align="left" prop="productName"/><!--物料编码-->
-      <el-table-column label="英文描述" align="left" prop="extraField.englishDesc"/><!--英文描述-->
+      <el-table-column label="批号" align="left" prop="lotNo"/><!--批号-->
-      <el-table-column label="箱号" align="left" prop="extraField.cartonNo"/><!--箱号-->
+      <el-table-column label="规格" align="left" prop="spec"/><!--规格-->
-      <el-table-column label="包装方式" align="left" prop="extraField.packingMethod"/><!--包装方式-->
+      <el-table-column label="型号" align="left" prop="spare1"/><!--型号-->
-<!--      <el-table-column :label="$t('inReceiveStockin.netWeight')" align="right" width="120px" prop="extraField.netWeight" /> &lt;!&ndash;净重&ndash;&gt;-->
+      <el-table-column label="净重" align="left" prop="spare2"/><!--净重-->
+      <el-table-column label="颜色" align="left" prop="spare3"/><!--颜色-->
+      <el-table-column label="序列号" align="left" prop="spare4"/><!--序列号-->
+      <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
+      <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
+      <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
+      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
       <el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量-->
       <el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量-->
       <el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量-->
+
     </el-table>
     <pagination
       v-show="detailTotal>0"