测试问题修改

ruoyi-admin/src/main/java/com/ruoyi/bas/BasCustomer/domain/BasCustomer.java

@@ -19,79 +19,79 @@ public class BasCustomer extends BaseEntity
     private String id;
 
     /** 客户编号 */
-    @Excel(name = "${bas.Customer.customerNo}")
+    @Excel(name = "客户编号")
     private String customerNo;
 
     /** 客户基本分类 */
-    @Excel(name = "${bas.Customer.customerGroupNo}")
+    @Excel(name = "客户基本分类")
     private String customerGroupNo;
 
     /** 客户名称 */
-    @Excel(name = "${bas.Customer.customerName}")
+    @Excel(name = "客户名称")
     private String customerName;
 
     /** 客户简称 */
-    @Excel(name = "${bas.Customer.simpleName}")
+    @Excel(name = "客户简称")
     private String simpleName;
 
     /** 是否可用 */
-    @Excel(name = "${bas.Customer.useable}",dictType = "is_available")
+    @Excel(name = "是否可用",dictType = "is_available")
     private String useable;
 
     /** 业务部门 */
-    @Excel(name = "${bas.Customer.businessDepartment}")
+    @Excel(name = "业务部门")
     private String businessDepartment;
 
     /** 业务员 */
-    @Excel(name = "${bas.Customer.salesman}")
+    @Excel(name = "业务员")
     private String salesman;
 
     /** 助忆码 */
-    @Excel(name = "${bas.Customer.mnemonicCode}")
+    @Excel(name = "助忆码")
     private String mnemonicCode;
 
     /** 客户类型 */
-    @Excel(name = "${bas.Customer.type}")
+    @Excel(name = "客户类型")
     private String type;
 
     /** 纳税人登记号 */
-    @Excel(name = "${bas.Customer.taxpayerRegistrationNumber}")
+    @Excel(name = "纳税人登记号")
     private String taxpayerRegistrationNumber;
 
     /** 对应财务组织 */
-    @Excel(name = "${bas.Customer.organization}")
+    @Excel(name = "对应财务组织")
     private String organization;
 
     /** 上级客户 */
-    @Excel(name = "${bas.Customer.supCustomer}")
+    @Excel(name = "上级客户")
     private String supCustomer;
 
     /** 散户 */
-    @Excel(name = "${bas.Customer.retailInvestor}")
+    @Excel(name = "散户")
     private String retailInvestor;
 
     /** 国家/地区 */
-    @Excel(name = "${bas.Customer.country}")
+    @Excel(name = "国家/地区")
     private String country;
 
     /** 时区 */
-    @Excel(name = "${bas.Customer.timeZone}")
+    @Excel(name = "时区")
     private String timeZone;
 
     /** 数据格式 */
-    @Excel(name = "${bas.Customer.dataFormat}")
+    @Excel(name = "数据格式")
     private String dataFormat;
 
     /** 联系人姓名 */
-    @Excel(name = "${bas.Customer.contactName}")
+    @Excel(name = "联系人姓名")
     private String contactName;
 
     /** 发货国家 */
-    @Excel(name = "${bas.Customer.shipment}")
+    @Excel(name = "发货国家")
     private String shipment;
 
     /** 税类 */
-    @Excel(name = "${bas.Customer.taxCategory}")
+    @Excel(name = "税类")
     private String taxCategory;
 
     public void setId(String id)

ruoyi-admin/src/main/java/com/ruoyi/bas/BasProduct/domain/BasProduct.java

@@ -1,5 +1,9 @@
 package com.ruoyi.bas.BasProduct.domain;
 
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -7,10 +11,14 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 物料管理对象 bas_product
- * 
+ *
  * @author gw
  * @date 2025-09-17
  */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ToString
 public class BasProduct extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -202,527 +210,10 @@ public class BasProduct extends BaseEntity
     @Excel(name = "包装材积")
     private String spare39;
 
-    public void setProductGuid(String productGuid) 
-    {
-        this.productGuid = productGuid;
-    }
 
-    public String getProductGuid() 
-    {
-        return productGuid;
-    }
+    private String lotNo;
 
-    public void setProductId(String productId) 
-    {
-        this.productId = productId;
-    }
+    private Integer quantity;
 
-    public String getProductId() 
-    {
-        return productId;
-    }
 
-    public void setParentId(String parentId) 
-    {
-        this.parentId = parentId;
-    }
-
-    public String getParentId() 
-    {
-        return parentId;
-    }
-
-    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 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 setProductName(String productName) 
-    {
-        this.productName = productName;
-    }
-
-    public String getProductName() 
-    {
-        return productName;
-    }
-
-    public void setSpare7(String spare7) 
-    {
-        this.spare7 = spare7;
-    }
-
-    public String getSpare7() 
-    {
-        return spare7;
-    }
-
-    public void setSpare8(String spare8) 
-    {
-        this.spare8 = spare8;
-    }
-
-    public String getSpare8() 
-    {
-        return spare8;
-    }
-
-    public void setSpare9(String spare9) 
-    {
-        this.spare9 = spare9;
-    }
-
-    public String getSpare9() 
-    {
-        return spare9;
-    }
-
-    public void setSpare10(String spare10) 
-    {
-        this.spare10 = spare10;
-    }
-
-    public String getSpare10() 
-    {
-        return spare10;
-    }
-
-    public void setSpare11(String spare11) 
-    {
-        this.spare11 = spare11;
-    }
-
-    public String getSpare11() 
-    {
-        return spare11;
-    }
-
-    public void setSpare12(String spare12) 
-    {
-        this.spare12 = spare12;
-    }
-
-    public String getSpare12() 
-    {
-        return spare12;
-    }
-
-    public void setSpare13(String spare13) 
-    {
-        this.spare13 = spare13;
-    }
-
-    public String getSpare13() 
-    {
-        return spare13;
-    }
-
-    public void setSpare14(String spare14) 
-    {
-        this.spare14 = spare14;
-    }
-
-    public String getSpare14() 
-    {
-        return spare14;
-    }
-
-    public void setSpare15(String spare15) 
-    {
-        this.spare15 = spare15;
-    }
-
-    public String getSpare15() 
-    {
-        return spare15;
-    }
-
-    public void setSpare16(String spare16) 
-    {
-        this.spare16 = spare16;
-    }
-
-    public String getSpare16() 
-    {
-        return spare16;
-    }
-
-    public void setSpare17(String spare17) 
-    {
-        this.spare17 = spare17;
-    }
-
-    public String getSpare17() 
-    {
-        return spare17;
-    }
-
-    public void setSpare18(String spare18) 
-    {
-        this.spare18 = spare18;
-    }
-
-    public String getSpare18() 
-    {
-        return spare18;
-    }
-
-    public void setSpare19(String spare19) 
-    {
-        this.spare19 = spare19;
-    }
-
-    public String getSpare19() 
-    {
-        return spare19;
-    }
-
-    public void setSpare20(String spare20) 
-    {
-        this.spare20 = spare20;
-    }
-
-    public String getSpare20() 
-    {
-        return spare20;
-    }
-
-    public void setSpare21(String spare21) 
-    {
-        this.spare21 = spare21;
-    }
-
-    public String getSpare21() 
-    {
-        return spare21;
-    }
-
-    public void setSpare22(String spare22) 
-    {
-        this.spare22 = spare22;
-    }
-
-    public String getSpare22() 
-    {
-        return spare22;
-    }
-
-    public void setSpare23(String spare23) 
-    {
-        this.spare23 = spare23;
-    }
-
-    public String getSpare23() 
-    {
-        return spare23;
-    }
-
-    public void setSpare24(String spare24) 
-    {
-        this.spare24 = spare24;
-    }
-
-    public String getSpare24() 
-    {
-        return spare24;
-    }
-
-    public void setSpare25(String spare25) 
-    {
-        this.spare25 = spare25;
-    }
-
-    public String getSpare25() 
-    {
-        return spare25;
-    }
-
-    public void setSpare26(String spare26) 
-    {
-        this.spare26 = spare26;
-    }
-
-    public String getSpare26() 
-    {
-        return spare26;
-    }
-
-    public void setSpare27(String spare27) 
-    {
-        this.spare27 = spare27;
-    }
-
-    public String getSpare27() 
-    {
-        return spare27;
-    }
-
-    public void setSpare28(String spare28) 
-    {
-        this.spare28 = spare28;
-    }
-
-    public String getSpare28() 
-    {
-        return spare28;
-    }
-
-    public void setSpare29(String spare29) 
-    {
-        this.spare29 = spare29;
-    }
-
-    public String getSpare29() 
-    {
-        return spare29;
-    }
-
-    public void setSpare30(String spare30) 
-    {
-        this.spare30 = spare30;
-    }
-
-    public String getSpare30() 
-    {
-        return spare30;
-    }
-
-    public void setSpare31(String spare31) 
-    {
-        this.spare31 = spare31;
-    }
-
-    public String getSpare31() 
-    {
-        return spare31;
-    }
-
-    public void setSpare32(String spare32) 
-    {
-        this.spare32 = spare32;
-    }
-
-    public String getSpare32() 
-    {
-        return spare32;
-    }
-
-    public void setSpare33(String spare33) 
-    {
-        this.spare33 = spare33;
-    }
-
-    public String getSpare33() 
-    {
-        return spare33;
-    }
-
-    public void setSpare34(String spare34) 
-    {
-        this.spare34 = spare34;
-    }
-
-    public String getSpare34() 
-    {
-        return spare34;
-    }
-
-    public void setSpare35(String spare35) 
-    {
-        this.spare35 = spare35;
-    }
-
-    public String getSpare35() 
-    {
-        return spare35;
-    }
-
-    public void setSpare36(String spare36) 
-    {
-        this.spare36 = spare36;
-    }
-
-    public String getSpare36() 
-    {
-        return spare36;
-    }
-
-    public void setSpare37(String spare37) 
-    {
-        this.spare37 = spare37;
-    }
-
-    public String getSpare37() 
-    {
-        return spare37;
-    }
-
-    public void setSpare38(String spare38) 
-    {
-        this.spare38 = spare38;
-    }
-
-    public String getSpare38() 
-    {
-        return spare38;
-    }
-
-    public void setSpare39(String spare39) 
-    {
-        this.spare39 = spare39;
-    }
-
-    public String getSpare39() 
-    {
-        return spare39;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("productGuid", getProductGuid())
-            .append("productId", getProductId())
-            .append("parentId", getParentId())
-            .append("price", getPrice())
-            .append("cargoNo", getCargoNo())
-            .append("unit", getUnit())
-            .append("spec", getSpec())
-            .append("remark", getRemark())
-            .append("spare1", getSpare1())
-            .append("spare2", getSpare2())
-            .append("spare3", getSpare3())
-            .append("spare4", getSpare4())
-            .append("spare5", getSpare5())
-            .append("spare6", getSpare6())
-            .append("productName", getProductName())
-            .append("spare7", getSpare7())
-            .append("spare8", getSpare8())
-            .append("spare9", getSpare9())
-            .append("spare10", getSpare10())
-            .append("spare11", getSpare11())
-            .append("spare12", getSpare12())
-            .append("spare13", getSpare13())
-            .append("spare14", getSpare14())
-            .append("spare15", getSpare15())
-            .append("spare16", getSpare16())
-            .append("spare17", getSpare17())
-            .append("spare18", getSpare18())
-            .append("spare19", getSpare19())
-            .append("spare20", getSpare20())
-            .append("spare21", getSpare21())
-            .append("spare22", getSpare22())
-            .append("spare23", getSpare23())
-            .append("spare24", getSpare24())
-            .append("spare25", getSpare25())
-            .append("spare26", getSpare26())
-            .append("spare27", getSpare27())
-            .append("spare28", getSpare28())
-            .append("spare29", getSpare29())
-            .append("spare30", getSpare30())
-            .append("spare31", getSpare31())
-            .append("spare32", getSpare32())
-            .append("spare33", getSpare33())
-            .append("spare34", getSpare34())
-            .append("spare35", getSpare35())
-            .append("spare36", getSpare36())
-            .append("spare37", getSpare37())
-            .append("spare38", getSpare38())
-            .append("spare39", getSpare39())
-            .toString();
-    }
 }

ruoyi-admin/src/main/java/com/ruoyi/bas/BasSupplier/domain/BasSupplier.java

@@ -19,71 +19,71 @@ public class BasSupplier extends BaseEntity
     private String id;
 
     /**  供应商编号 */
-    @Excel(name = "${bas.Supplier.supplierNo}")
+    @Excel(name = "供应商编号")
     private String supplierNo;
 
     /** 供应商名称 */
-    @Excel(name = "${bas.Supplier.supplierGroupNo}")
+    @Excel(name = "供应商名称")
     private String supplierGroupNo;
 
     /** 供应商名称 */
-    @Excel(name = "${bas.Supplier.supplierName}")
+    @Excel(name = "供应商名称")
     private String supplierName;
 
     /** 简称 */
-    @Excel(name = "${bas.Supplier.simpleName}")
+    @Excel(name = "简称")
     private String simpleName;
 
     /** 是否可用 */
-    @Excel(name = "${bas.Supplier.useable}",dictType = "is_available")
+    @Excel(name = "是否可用",dictType = "is_available")
     private String useable;
 
     /** 地区分类 */
-    @Excel(name = "${bas.Supplier.supplierArae}")
+    @Excel(name = "地区分类")
     private String supplierArae;
 
     /** 纳税人登记号 */
-    @Excel(name = "${bas.Supplier.taxpayerRegistrationNumber}")
+    @Excel(name = "纳税人登记号")
     private String taxpayerRegistrationNumber;
 
     /** 国家 */
-    @Excel(name = "${bas.Supplier.country}")
+    @Excel(name = "国家")
     private String country;
 
     /** 时区 */
-    @Excel(name = "${bas.Supplier.timeZone}")
+    @Excel(name = "时区")
     private String timeZone;
 
     /** 数据格式 */
-    @Excel(name = "${bas.Supplier.dataFormat}")
+    @Excel(name = "数据格式")
     private String dataFormat;
 
     /** 收货国家 */
-    @Excel(name = "${bas.Supplier.receivingCountry}")
+    @Excel(name = "收货国家")
     private String receivingCountry;
 
     /** 税类 */
-    @Excel(name = "${bas.Supplier.taxCategory}")
+    @Excel(name = "税类")
     private String taxCategory;
 
     /** 法人 */
-    @Excel(name = "${bas.Supplier.legalPerson}")
+    @Excel(name = "法人")
     private String legalPerson;
 
     /** 注册资金 */
-    @Excel(name = "${bas.Supplier.registeredCapital}")
+    @Excel(name = "注册资金")
     private String registeredCapital;
 
     /** 企业地址 */
-    @Excel(name = "${bas.Supplier.address}")
+    @Excel(name = "企业地址")
     private String address;
 
     /** 联系人姓名 */
-    @Excel(name = "${bas.Supplier.contactName}")
+    @Excel(name = "联系人姓名")
     private String contactName;
 
     /** 联系电话 */
-    @Excel(name = "${bas.Supplier.contactNumber}")
+    @Excel(name = "联系电话")
     private String contactNumber;
 
     public void setId(String id)

ruoyi-admin/src/main/java/com/ruoyi/bas/roadway/domain/BasRoadway.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 巷道管理对象 bas_roadway
- * 
+ *
  * @author ruoyi
  * @date 2025-09-12
  */
@@ -19,11 +19,10 @@ public class BasRoadway extends BaseEntity
     private String id;
 
     /** 巷道号（不允许为空） */
-    @Excel(name = "巷道号", readConverterExp = "不=允许为空")
+    @Excel(name = "巷道号")
     private String roadwayId;
 
     /** 仓库id（不允许为空） */
-    @Excel(name = "仓库id", readConverterExp = "不=允许为空")
     private String warehouseId;
 
     /** 巷道名称 */
@@ -31,111 +30,110 @@ public class BasRoadway extends BaseEntity
     private String roadwayName;
 
     /** 设备id/328区分1层2层 */
-    @Excel(name = "设备id/328区分1层2层")
     private String deviceId;
 
     /** 一层入库锁 */
-    @Excel(name = "一层入库锁")
+    @Excel(name = "一层入库锁" ,dictType = "roadway_lock")
     private String inLocked;
 
     /** 一层出库锁 */
-    @Excel(name = "一层出库锁")
+    @Excel(name = "一层出库锁",dictType = "roadway_lock")
     private String outLocked;
 
     /** 二层入库锁 */
-    @Excel(name = "二层入库锁")
+    @Excel(name = "二层入库锁",dictType = "roadway_lock")
     private String inLocked2;
 
     /** 二层出库锁 */
-    @Excel(name = "二层出库锁")
+    @Excel(name = "二层出库锁",dictType = "roadway_lock")
     private String outLocked2;
 
-    public void setId(String id) 
+    public void setId(String id)
     {
         this.id = id;
     }
 
-    public String getId() 
+    public String getId()
     {
         return id;
     }
 
-    public void setRoadwayId(String roadwayId) 
+    public void setRoadwayId(String roadwayId)
     {
         this.roadwayId = roadwayId;
     }
 
-    public String getRoadwayId() 
+    public String getRoadwayId()
     {
         return roadwayId;
     }
 
-    public void setWarehouseId(String warehouseId) 
+    public void setWarehouseId(String warehouseId)
     {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId() 
+    public String getWarehouseId()
     {
         return warehouseId;
     }
 
-    public void setRoadwayName(String roadwayName) 
+    public void setRoadwayName(String roadwayName)
     {
         this.roadwayName = roadwayName;
     }
 
-    public String getRoadwayName() 
+    public String getRoadwayName()
     {
         return roadwayName;
     }
 
-    public void setDeviceId(String deviceId) 
+    public void setDeviceId(String deviceId)
     {
         this.deviceId = deviceId;
     }
 
-    public String getDeviceId() 
+    public String getDeviceId()
     {
         return deviceId;
     }
 
-    public void setInLocked(String inLocked) 
+    public void setInLocked(String inLocked)
     {
         this.inLocked = inLocked;
     }
 
-    public String getInLocked() 
+    public String getInLocked()
     {
         return inLocked;
     }
 
-    public void setOutLocked(String outLocked) 
+    public void setOutLocked(String outLocked)
     {
         this.outLocked = outLocked;
     }
 
-    public String getOutLocked() 
+    public String getOutLocked()
     {
         return outLocked;
     }
 
-    public void setInLocked2(String inLocked2) 
+    public void setInLocked2(String inLocked2)
     {
         this.inLocked2 = inLocked2;
     }
 
-    public String getInLocked2() 
+    public String getInLocked2()
     {
         return inLocked2;
     }
 
-    public void setOutLocked2(String outLocked2) 
+    public void setOutLocked2(String outLocked2)
     {
         this.outLocked2 = outLocked2;
     }
 
-    public String getOutLocked2() 
+    public String getOutLocked2()
     {
         return outLocked2;
     }

ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java

@@ -207,6 +207,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
             basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
 
             mydoJob.setStatus("5");
+            mydoJob.setFinishTime(DateUtil.formatDateTime(new Date()));
             updateMydoJob(mydoJob);
             //插入历史表
             insertHistory(mydoJob.getJobId());