修bug

ruoyi-admin-vue/src/views/login.vue

@@ -72,8 +72,8 @@ export default {
       title: process.env.VUE_APP_TITLE,
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/OutboundOrderItems.java

@@ -2,6 +2,7 @@ package com.ruoyi.inventory.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2025-12-03
  */
+@Data
 public class OutboundOrderItems extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -76,7 +78,7 @@ public class OutboundOrderItems extends BaseEntity
 
     /** 约数 */
     @Excel(name = "约数")
-    private Long divisor;
+    private double divisor;
 
     /** 标签颜色 字典，检索条件 */
     @Excel(name = "标签颜色 字典，检索条件")
@@ -115,276 +117,5 @@ public class OutboundOrderItems extends BaseEntity
     @Excel(name = "排序号")
     private String updateUserCode;
 
-    // ========== 原有getter/setter（完全保留） ==========
-    public String getInventoryId() {
-        return inventoryId;
-    }
 
-    public void setInventoryId(String inventoryId) {
-        this.inventoryId = inventoryId;
-    }
-
-    public String getOutboundOrderId() {
-        return outboundOrderId;
-    }
-
-    public void setOutboundOrderId(String outboundOrderId) {
-        this.outboundOrderId = outboundOrderId;
-    }
-
-    public Long getUnitPrice() {
-        return unitPrice;
-    }
-
-    public void setUnitPrice(Long unitPrice) {
-        this.unitPrice = unitPrice;
-    }
-
-    public void setId(String id)
-    {
-        this.id = id;
-    }
-
-    public String getId()
-    {
-        return id;
-    }
-
-    public void setOrderId(String orderId)
-    {
-        this.orderId = orderId;
-    }
-
-    public String getOrderId()
-    {
-        return orderId;
-    }
-
-    public void setMaterialId(String materialId)
-    {
-        this.materialId = materialId;
-    }
-
-    public String getMaterialId()
-    {
-        return materialId;
-    }
-
-    public void setBatchCode(String batchCode)
-    {
-        this.batchCode = batchCode;
-    }
-
-    public String getBatchCode()
-    {
-        return batchCode;
-    }
-
-    public void setWarehouseId(String warehouseId)
-    {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseId()
-    {
-        return warehouseId;
-    }
-
-    public void setLocationId(String locationId)
-    {
-        this.locationId = locationId;
-    }
-
-    public String getLocationId()
-    {
-        return locationId;
-    }
-
-    public void setPlannedQuantity(Long plannedQuantity)
-    {
-        this.plannedQuantity = plannedQuantity;
-    }
-
-    public Long getPlannedQuantity()
-    {
-        return plannedQuantity;
-    }
-
-    public void setActualQuantity(Long actualQuantity)
-    {
-        this.actualQuantity = actualQuantity;
-    }
-
-    public Long getActualQuantity()
-    {
-        return actualQuantity;
-    }
-
-    public void setDivisor(Long divisor)
-    {
-        this.divisor = divisor;
-    }
-
-    public Long getDivisor()
-    {
-        return divisor;
-    }
-
-    public void setLabelColor(Long labelColor)
-    {
-        this.labelColor = labelColor;
-    }
-
-    public Long getLabelColor()
-    {
-        return labelColor;
-    }
-
-    public void setVoucherNumber(String voucherNumber)
-    {
-        this.voucherNumber = voucherNumber;
-    }
-
-    public String getVoucherNumber()
-    {
-        return voucherNumber;
-    }
-
-    public void setItemStatus(Long itemStatus)
-    {
-        this.itemStatus = itemStatus;
-    }
-
-    public Long getItemStatus()
-    {
-        return itemStatus;
-    }
-
-    public void setShippedAt(Date shippedAt)
-    {
-        this.shippedAt = shippedAt;
-    }
-
-    public Date getShippedAt()
-    {
-        return shippedAt;
-    }
-
-    public void setShippedBy(String shippedBy)
-    {
-        this.shippedBy = shippedBy;
-    }
-
-    public String getShippedBy()
-    {
-        return shippedBy;
-    }
-
-    public void setIsUsed(Long isUsed)
-    {
-        this.isUsed = isUsed;
-    }
-
-    public Long getIsUsed()
-    {
-        return isUsed;
-    }
-
-    public void setSortNo(Long sortNo)
-    {
-        this.sortNo = sortNo;
-    }
-
-    public Long getSortNo()
-    {
-        return sortNo;
-    }
-
-    public void setCreateUserCode(String createUserCode)
-    {
-        this.createUserCode = createUserCode;
-    }
-
-    public String getCreateUserCode()
-    {
-        return createUserCode;
-    }
-
-    public void setUpdateUserCode(String updateUserCode)
-    {
-        this.updateUserCode = updateUserCode;
-    }
-
-    public String getUpdateUserCode()
-    {
-        return updateUserCode;
-    }
-
-    // ========== 新增缺失字段的getter/setter（仅补充，不修改原有） ==========
-    // 解决核心报错：warehouseName的getter/setter
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    // materialName的getter/setter
-    public String getMaterialName() {
-        return materialName;
-    }
-
-    public void setMaterialName(String materialName) {
-        this.materialName = materialName;
-    }
-
-    // locationName的getter/setter
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    // inboundOrderId的getter/setter
-    public String getInboundOrderId() {
-        return inboundOrderId;
-    }
-
-    public void setInboundOrderId(String inboundOrderId) {
-        this.inboundOrderId = inboundOrderId;
-    }
-
-    // ========== 原有toString（完全保留） ==========
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("orderId", getOrderId())
-                .append("materialId", getMaterialId())
-                .append("batchCode", getBatchCode())
-                .append("warehouseId", getWarehouseId())
-                .append("locationId", getLocationId())
-                .append("inventoryId", getInventoryId())
-                .append("outboundOrderId", getOutboundOrderId())
-                .append("unitPrice", getUnitPrice())
-                .append("plannedQuantity", getPlannedQuantity())
-                .append("actualQuantity", getActualQuantity())
-                .append("divisor", getDivisor())
-                .append("labelColor", getLabelColor())
-                .append("voucherNumber", getVoucherNumber())
-                .append("itemStatus", getItemStatus())
-                .append("shippedAt", getShippedAt())
-                .append("shippedBy", getShippedBy())
-                .append("remark", getRemark())
-                .append("isUsed", getIsUsed())
-                .append("sortNo", getSortNo())
-                .append("createTime", getCreateTime())
-                .append("createUserCode", getCreateUserCode())
-                .append("updateTime", getUpdateTime())
-                .append("updateUserCode", getUpdateUserCode())
-                .toString();
-    }
 }
\ No newline at end of file

ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/OutboundOrders.java

@@ -90,7 +90,7 @@ public class OutboundOrders extends BaseEntity
     @Excel(name = "排序")
     private Long sortNo;
 
-    private Long orderType;
+    private String orderType;
 
     /** 创建日期 */
     @Excel(name = "创建日期")

ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/vo/OutboundTemplateVO.java

@@ -3,6 +3,7 @@ package com.ruoyi.inventory.domain.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +15,7 @@ import java.util.Date;
  * @author ruoyi
  * @date 2025-12-03
  */
+@Data
 public class OutboundTemplateVO extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -48,9 +50,11 @@ public class OutboundTemplateVO extends BaseEntity {
     @Excel(name = "计划数量")
     private Long plannedQuantity;
 
+    @Excel(name = "约数")
+    private double divisor;
     /** 件重 */
     @Excel(name = "件重")
-    private Long pieceWeight;
+    private double pieceWeight;
 
     /** 件数（实际件数） */
     @Excel(name = "件数")
@@ -125,266 +129,4 @@ public class OutboundTemplateVO extends BaseEntity {
     @Excel(name = "单件重量")
     private Long singlePieceWeight;
 
-    // ===================== Getter & Setter 完整实现 =====================
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Date getInboundDate() {
-        return inboundDate;
-    }
-
-    public void setInboundDate(Date inboundDate) {
-        this.inboundDate = inboundDate;
-    }
-
-    public String getSapNo() {
-        return sapNo;
-    }
-
-    public void setSapNo(String sapNo) {
-        this.sapNo = sapNo;
-    }
-
-    public void setTsCode(String tsCode) {
-        this.tsCode = tsCode;
-    }
-
-    public String getBatchCode() {
-        return batchCode;
-    }
-
-    public void setBatchCode(String batchCode) {
-        this.batchCode = batchCode;
-    }
-
-    public String getMaterialId() {
-        return materialId;
-    }
-
-    public void setMaterialId(String materialId) {
-        this.materialId = materialId;
-    }
-
-    public String getMaterialName() {
-        return materialName;
-    }
-
-    public void setMaterialName(String materialName) {
-        this.materialName = materialName;
-    }
-
-    public String getTsCode() {
-        return tsCode;
-    }
-
-    public void setTsCo(String tsCode) {
-        this.tsCode = tsCode;
-    }
-
-
-    public Long getPlannedQuantity() {
-        return plannedQuantity;
-    }
-
-    public void setPlannedQuantity(Long plannedQuantity) {
-        this.plannedQuantity = plannedQuantity;
-    }
-
-    public Long getPieceWeight() {
-        return pieceWeight;
-    }
-
-    public void setPieceWeight(Long pieceWeight) {
-        this.pieceWeight = pieceWeight;
-    }
-
-    public Long getActualPackages() {
-        return actualPackages;
-    }
-
-    public void setActualPackages(Long actualPackages) {
-        this.actualPackages = actualPackages;
-    }
-
-    public Long getActualQuantity() {
-        return actualQuantity;
-    }
-
-    public void setActualQuantity(Long actualQuantity) {
-        this.actualQuantity = actualQuantity;
-    }
-
-    public String getLocationName() {
-        return locationName;
-    }
-
-    public void setLocationName(String locationName) {
-        this.locationName = locationName;
-    }
-
-    public String getLocationId() {
-        return locationId;
-    }
-
-    public void setLocationId(String locationId) {
-        this.locationId = locationId;
-    }
-
-    public String getWarehouseId() {
-        return warehouseId;
-    }
-
-    public void setWarehouseId(String warehouseId) {
-        this.warehouseId = warehouseId;
-    }
-
-    public String getWarehouseName() {
-        return warehouseName;
-    }
-
-    public void setWarehouseName(String warehouseName) {
-        this.warehouseName = warehouseName;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Long getLabelColor() {
-        return labelColor;
-    }
-
-    public void setLabelColor(Long labelColor) {
-        this.labelColor = labelColor;
-    }
-
-    public String getVoucherNumber() {
-        return voucherNumber;
-    }
-
-    public void setVoucherNumber(String voucherNumber) {
-        this.voucherNumber = voucherNumber;
-    }
-
-    public String getInsulation() {
-        return insulation;
-    }
-
-    public void setInsulation(String insulation) {
-        this.insulation = insulation;
-    }
-
-    public String getDangerCheckType() {
-        return dangerCheckType;
-    }
-
-    public void setDangerCheckType(String dangerCheckType) {
-        this.dangerCheckType = dangerCheckType;
-    }
-
-    public String getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(String orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getSystemNo() {
-        return systemNo;
-    }
-
-    public void setSystemNo(String systemNo) {
-        this.systemNo = systemNo;
-    }
-
-    public String getOrderType() {
-        return orderType;
-    }
-
-    public void setOrderType(String orderType) {
-        this.orderType = orderType;
-    }
-
-    public String getOwnerId() {
-        return ownerId;
-    }
-
-    public void setOwnerId(String ownerId) {
-        this.ownerId = ownerId;
-    }
-
-    public String getOwnerName() {
-        return ownerName;
-    }
-
-    public void setOwnerName(String ownerName) {
-        this.ownerName = ownerName;
-    }
-
-    public String getDestination() {
-        return destination;
-    }
-
-    public void setDestination(String destination) {
-        this.destination = destination;
-    }
-
-    public String getReservation() {
-        return reservation;
-    }
-
-    public void setReservation(String reservation) {
-        this.reservation = reservation;
-    }
-
-    public Long getSinglePieceWeight() {
-        return singlePieceWeight;
-    }
-
-    public void setSinglePieceWeight(Long singlePieceWeight) {
-        this.singlePieceWeight = singlePieceWeight;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", id)
-                .append("inboundDate", inboundDate)
-                .append("sapNo", sapNo)
-                .append("materialId", materialId)
-                .append("materialName", materialName)
-                .append("tsCode", tsCode)
-                .append("plannedQuantity", plannedQuantity)
-                .append("pieceWeight", pieceWeight)
-                .append("actualPackages", actualPackages)
-                .append("actualQuantity", actualQuantity)
-                .append("locationName", locationName)
-                .append("locationId", locationId)
-                .append("warehouseId", warehouseId)
-                .append("warehouseName", warehouseName)
-                .append("remark", remark)
-                .append("labelColor", labelColor)
-                .append("voucherNumber", voucherNumber)
-                .append("insulation", insulation)
-                .append("dangerCheckType", dangerCheckType)
-                .append("orderId", orderId)
-                .append("systemNo", systemNo)
-                .append("orderType", orderType)
-                .append("ownerId", ownerId)
-                .append("ownerName", ownerName)
-                .append("destination", destination)
-                .append("reservation", reservation)
-                .append("singlePieceWeight", singlePieceWeight)
-                .toString();
-    }
 }
\ No newline at end of file

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/impl/OutboundOrdersServiceImpl.java

@@ -345,10 +345,10 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService
 
                     mainDO.setId(UUID.randomUUID().toString());
                     mainDO.setOrderId(orderId);
-                    mainDO.setOrderStatus(3L);
+                    mainDO.setOrderStatus(2L);
                     mainDO.setCreateBy(operId);
                     mainDO.setCreateTime(now);
-                    mainDO.setOrderType(Long.valueOf(orderType));
+                    mainDO.setOrderTypeId(String.valueOf(orderType));
                     mainDO.setCreateUserCode(operId);
                     mainDO.setUpdateBy(operId);
                     mainDO.setUpdateTime(now);