Merge remote-tracking branch 'origin/master'

ruoyi-admin-vue/src/api/inventory/inbound.js

+import request from '@/utils/request'
+
+// 查询入库列表
+export function listInbound(query) {
+  return request({
+    url: '/inventory/inbound/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询入库详细
+export function getInbound(id) {
+  return request({
+    url: '/inventory/inbound/' + id,
+    method: 'get'
+  })
+}
+
+// 新增入库
+export function addInbound(data) {
+  return request({
+    url: '/inventory/inbound',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入库
+export function updateInbound(data) {
+  return request({
+    url: '/inventory/inbound',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入库
+export function delInbound(id) {
+  return request({
+    url: '/inventory/inbound/' + id,
+    method: 'delete'
+  })
+}

ruoyi-admin-vue/src/api/inventory/inbound_items.js

+import request from '@/utils/request'
+
+// 查询入库单明细列表
+export function listInbound_items(query) {
+  return request({
+    url: '/inventory/inbound_items/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询入库单明细详细
+export function getInbound_items(id) {
+  return request({
+    url: '/inventory/inbound_items/' + id,
+    method: 'get'
+  })
+}
+
+// 新增入库单明细
+export function addInbound_items(data) {
+  return request({
+    url: '/inventory/inbound_items',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改入库单明细
+export function updateInbound_items(data) {
+  return request({
+    url: '/inventory/inbound_items',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除入库单明细
+export function delInbound_items(id) {
+  return request({
+    url: '/inventory/inbound_items/' + id,
+    method: 'delete'
+  })
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/inventory/InboundOrderItemsController.java

+package com.ruoyi.web.controller.inventory;
+
+import java.util.List;
+import java.util.UUID;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.inventory.domain.InboundOrderItems;
+import com.ruoyi.inventory.service.IInboundOrderItemsService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 入库单明细Controller
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+@RestController
+@RequestMapping("/inventory/inbound_items")
+public class InboundOrderItemsController extends BaseController
+{
+    @Autowired
+    private IInboundOrderItemsService inboundOrderItemsService;
+
+    /**
+     * 查询入库单明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound_items:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(InboundOrderItems inboundOrderItems)
+    {
+        startPage();
+        List<InboundOrderItems> list = inboundOrderItemsService.selectInboundOrderItemsList(inboundOrderItems);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入库单明细列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound_items:export')")
+    @Log(title = "入库单明细", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, InboundOrderItems inboundOrderItems)
+    {
+        List<InboundOrderItems> list = inboundOrderItemsService.selectInboundOrderItemsList(inboundOrderItems);
+        ExcelUtil<InboundOrderItems> util = new ExcelUtil<InboundOrderItems>(InboundOrderItems.class);
+        util.exportExcel(response, list, "入库单明细数据");
+    }
+
+    /**
+     * 获取入库单明细详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound_items:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(inboundOrderItemsService.selectInboundOrderItemsById(id));
+    }
+
+    /**
+     * 新增入库单明细
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound_items:add')")
+    @Log(title = "入库单明细", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody InboundOrderItems inboundOrderItems)
+    {
+        inboundOrderItems.setId(UUID.randomUUID().toString());
+        System.out.println(inboundOrderItems.toString());
+        return toAjax(inboundOrderItemsService.insertInboundOrderItems(inboundOrderItems));
+    }
+
+    /**
+     * 修改入库单明细
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound_items:edit')")
+    @Log(title = "入库单明细", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody InboundOrderItems inboundOrderItems)
+    {
+        return toAjax(inboundOrderItemsService.updateInboundOrderItems(inboundOrderItems));
+    }
+
+    /**
+     * 删除入库单明细
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound_items:remove')")
+    @Log(title = "入库单明细", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(inboundOrderItemsService.deleteInboundOrderItemsByIds(ids));
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/inventory/InboundOrdersController.java

+package com.ruoyi.web.controller.inventory;
+
+import java.util.List;
+import com.ruoyi.common.utils.uuid.UUID;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.inventory.domain.InboundOrders;
+import com.ruoyi.inventory.service.IInboundOrdersService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 入库单主Controller
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+@RestController
+@RequestMapping("/inventory/inbound")
+public class InboundOrdersController extends BaseController
+{
+    @Autowired
+    private IInboundOrdersService inboundOrdersService;
+
+    /**
+     * 查询入库单主列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(InboundOrders inboundOrders)
+    {
+        startPage();
+        List<InboundOrders> list = inboundOrdersService.selectInboundOrdersList(inboundOrders);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出入库单主列表
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound:export')")
+    @Log(title = "入库单主", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, InboundOrders inboundOrders)
+    {
+        List<InboundOrders> list = inboundOrdersService.selectInboundOrdersList(inboundOrders);
+        ExcelUtil<InboundOrders> util = new ExcelUtil<InboundOrders>(InboundOrders.class);
+        util.exportExcel(response, list, "入库单主数据");
+    }
+
+    /**
+     * 获取入库单主详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return success(inboundOrdersService.selectInboundOrdersById(id));
+    }
+
+    /**
+     * 新增入库单主
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound:add')")
+    @Log(title = "入库单主", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody InboundOrders inboundOrders)
+    {
+        inboundOrders.setId(UUID.randomUUID().toString());
+        return toAjax(inboundOrdersService.insertInboundOrders(inboundOrders));
+    }
+
+    /**
+     * 修改入库单主
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound:edit')")
+    @Log(title = "入库单主", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody InboundOrders inboundOrders)
+    {
+        return toAjax(inboundOrdersService.updateInboundOrders(inboundOrders));
+    }
+
+    /**
+     * 删除入库单主
+     */
+    @PreAuthorize("@ss.hasPermi('inventory:inbound:remove')")
+    @Log(title = "入库单主", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(inboundOrdersService.deleteInboundOrdersByIds(ids));
+    }
+}

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

+package com.ruoyi.inventory.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 入库单明细对象 inbound_order_items
+ *
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+public class InboundOrderItems extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private String id;
+
+    /** 入库单号 检索条件 */
+    @Excel(name = "入库单号")
+    private String orderId;
+
+    /** 货物ID 字典，检索条件 */
+    @Excel(name = "货物ID")
+    private String materialId;
+
+    /** 批次ID 检索条件 */
+    @Excel(name = "批次ID")
+    private String batchId;
+
+    /** 仓库ID 检索条件 */
+    @Excel(name = "仓库ID")
+    private String warehouseId;
+
+    /** 库位ID 检索条件 */
+    @Excel(name = "库位ID")
+    private String locationId;
+
+    /** 计划数量 */
+    @Excel(name = "计划数量")
+    private Long plannedQuantity;
+
+    /** 实际数量 */
+    @Excel(name = "实际数量")
+    private Long actualQuantity;
+
+    /** 计划件数 暂无用 */
+    @Excel(name = "计划件数")
+    private Long plannedPackages;
+
+    /** 实际件数 */
+    @Excel(name = "实际件数")
+    private Long actualPackages;
+
+    /** 约数 */
+    @Excel(name = "约数")
+    private Long divisor;
+
+    /** 标签颜色 字典，检索条件 */
+    @Excel(name = "标签颜色")
+    private Long labelColor;
+
+    /** 凭证号 检索条件 */
+    @Excel(name = "凭证号")
+    private String voucherNumber;
+
+    /** 单价 */
+    @Excel(name = "单价")
+    private Long unitPrice;
+
+    /** 状态1-待收货 2-部分收货 3-已完成 暂无用 */
+    @Excel(name = "状态")
+    private Long itemStatus;
+
+    /** 收货时间 暂无用 */
+    @Excel(name = "收货时间")
+    private Long receivedAt;
+
+    /** 收货人 */
+    @Excel(name = "收货人")
+    private String receivedBy;
+
+    /** 应用数据1使用0删除 删除用 */
+    @Excel(name = "应用数据")
+    private Long isUsed;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sortNo;
+
+    /** 创建日期 */
+    @Excel(name = "创建日期")
+    private String createUserCode;
+
+    /** 排序号 */
+    @Excel(name = "排序号")
+    private String updateUserCode;
+
+    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 setBatchId(String batchId)
+    {
+        this.batchId = batchId;
+    }
+
+    public String getBatchId()
+    {
+        return batchId;
+    }
+
+    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 setPlannedPackages(Long plannedPackages)
+    {
+        this.plannedPackages = plannedPackages;
+    }
+
+    public Long getPlannedPackages()
+    {
+        return plannedPackages;
+    }
+
+    public void setActualPackages(Long actualPackages)
+    {
+        this.actualPackages = actualPackages;
+    }
+
+    public Long getActualPackages()
+    {
+        return actualPackages;
+    }
+
+    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 setUnitPrice(Long unitPrice)
+    {
+        this.unitPrice = unitPrice;
+    }
+
+    public Long getUnitPrice()
+    {
+        return unitPrice;
+    }
+
+    public void setItemStatus(Long itemStatus)
+    {
+        this.itemStatus = itemStatus;
+    }
+
+    public Long getItemStatus()
+    {
+        return itemStatus;
+    }
+
+    public void setReceivedAt(Long receivedAt)
+    {
+        this.receivedAt = receivedAt;
+    }
+
+    public Long getReceivedAt()
+    {
+        return receivedAt;
+    }
+
+    public void setReceivedBy(String receivedBy)
+    {
+        this.receivedBy = receivedBy;
+    }
+
+    public String getReceivedBy()
+    {
+        return receivedBy;
+    }
+
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("orderId", getOrderId())
+                .append("materialId", getMaterialId())
+                .append("batchId", getBatchId())
+                .append("warehouseId", getWarehouseId())
+                .append("locationId", getLocationId())
+                .append("plannedQuantity", getPlannedQuantity())
+                .append("actualQuantity", getActualQuantity())
+                .append("plannedPackages", getPlannedPackages())
+                .append("actualPackages", getActualPackages())
+                .append("divisor", getDivisor())
+                .append("labelColor", getLabelColor())
+                .append("voucherNumber", getVoucherNumber())
+                .append("unitPrice", getUnitPrice())
+                .append("itemStatus", getItemStatus())
+                .append("receivedAt", getReceivedAt())
+                .append("receivedBy", getReceivedBy())
+                .append("remark", getRemark())
+                .append("isUsed", getIsUsed())
+                .append("sortNo", getSortNo())
+                .append("createTime", getCreateTime())
+                .append("createUserCode", getCreateUserCode())
+                .append("updateTime", getUpdateTime())
+                .append("updateUserCode", getUpdateUserCode())
+                .toString();
+    }
+}

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

+package com.ruoyi.inventory.domain;
+
+import java.util.List;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 入库单主对象 inbound_orders
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+public class InboundOrders extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 编号 */
+    private String id;
+
+    /** 入库单号 检索条件 */
+    @Excel(name = "入库单号 检索条件")
+    private String orderId;
+
+    /** 系统编号 检索条件 */
+    @Excel(name = "系统编号 检索条件")
+    private String systemNo;
+
+    /** 入库类型 字典，检索条件 */
+    @Excel(name = "入库类型 字典，检索条件")
+    private String orderTypeId;
+
+    /** 批次ID 检索条件 */
+    @Excel(name = "批次ID 检索条件")
+    private String batchCode;
+
+    /** 仓库ID 暂无用 */
+    @Excel(name = "仓库ID 暂无用")
+    private String warehouseId;
+
+    /** 货主ID */
+    @Excel(name = "货主ID")
+    private String ownerId;
+
+    /** 入库单状态1-草稿 2-已完成 3-已取消 字典，检索条件 */
+    @Excel(name = "入库单状态1-草稿 2-已完成 3-已取消 字典，检索条件")
+    private Long orderStatus;
+
+    /** 入库日期 日期无时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "入库日期 日期无时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inboundDate;
+
+    /** 订单类型 字典，检索条件 */
+    @Excel(name = "订单类型 字典，检索条件")
+    private String orderType;
+
+    /** 计划量 暂无用 */
+    @Excel(name = "计划量 暂无用")
+    private Long totalPlannedQuantity;
+
+    /** 实际量 暂无用 */
+    @Excel(name = "实际量 暂无用")
+    private Long totalActualQuantity;
+
+    /** 总件数 暂无用 */
+    @Excel(name = "总件数 暂无用")
+    private Long totalPackages;
+
+    /** 负责人 暂无用 */
+    @Excel(name = "负责人 暂无用")
+    private String opUserName;
+
+    /** 应用数据1使用0删除 删除用 */
+    @Excel(name = "应用数据1使用0删除 删除用")
+    private Long isUsed;
+
+    /** 排序 */
+    @Excel(name = "排序")
+    private Long sortNo;
+
+    /** 创建日期 */
+    @Excel(name = "创建日期")
+    private String createUserCode;
+
+    /** 排序号 */
+    @Excel(name = "排序号")
+    private String updateUserCode;
+
+    /** 入库单明细信息 */
+    private List<InboundOrderItems> inboundOrderItemsList;
+
+    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 setSystemNo(String systemNo) 
+    {
+        this.systemNo = systemNo;
+    }
+
+    public String getSystemNo() 
+    {
+        return systemNo;
+    }
+
+    public void setOrderTypeId(String orderTypeId) 
+    {
+        this.orderTypeId = orderTypeId;
+    }
+
+    public String getOrderTypeId() 
+    {
+        return orderTypeId;
+    }
+
+    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 setOwnerId(String ownerId) 
+    {
+        this.ownerId = ownerId;
+    }
+
+    public String getOwnerId() 
+    {
+        return ownerId;
+    }
+
+    public void setOrderStatus(Long orderStatus) 
+    {
+        this.orderStatus = orderStatus;
+    }
+
+    public Long getOrderStatus() 
+    {
+        return orderStatus;
+    }
+
+    public void setInboundDate(Date inboundDate) 
+    {
+        this.inboundDate = inboundDate;
+    }
+
+    public Date getInboundDate() 
+    {
+        return inboundDate;
+    }
+
+    public void setOrderType(String orderType) 
+    {
+        this.orderType = orderType;
+    }
+
+    public String getOrderType() 
+    {
+        return orderType;
+    }
+
+    public void setTotalPlannedQuantity(Long totalPlannedQuantity) 
+    {
+        this.totalPlannedQuantity = totalPlannedQuantity;
+    }
+
+    public Long getTotalPlannedQuantity() 
+    {
+        return totalPlannedQuantity;
+    }
+
+    public void setTotalActualQuantity(Long totalActualQuantity) 
+    {
+        this.totalActualQuantity = totalActualQuantity;
+    }
+
+    public Long getTotalActualQuantity() 
+    {
+        return totalActualQuantity;
+    }
+
+    public void setTotalPackages(Long totalPackages) 
+    {
+        this.totalPackages = totalPackages;
+    }
+
+    public Long getTotalPackages() 
+    {
+        return totalPackages;
+    }
+
+    public void setOpUserName(String opUserName) 
+    {
+        this.opUserName = opUserName;
+    }
+
+    public String getOpUserName() 
+    {
+        return opUserName;
+    }
+
+    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;
+    }
+
+    public List<InboundOrderItems> getInboundOrderItemsList()
+    {
+        return inboundOrderItemsList;
+    }
+
+    public void setInboundOrderItemsList(List<InboundOrderItems> inboundOrderItemsList)
+    {
+        this.inboundOrderItemsList = inboundOrderItemsList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("orderId", getOrderId())
+            .append("systemNo", getSystemNo())
+            .append("orderTypeId", getOrderTypeId())
+            .append("batchCode", getBatchCode())
+            .append("warehouseId", getWarehouseId())
+            .append("ownerId", getOwnerId())
+            .append("orderStatus", getOrderStatus())
+            .append("inboundDate", getInboundDate())
+            .append("orderType", getOrderType())
+            .append("totalPlannedQuantity", getTotalPlannedQuantity())
+            .append("totalActualQuantity", getTotalActualQuantity())
+            .append("totalPackages", getTotalPackages())
+            .append("remark", getRemark())
+            .append("opUserName", getOpUserName())
+            .append("isUsed", getIsUsed())
+            .append("sortNo", getSortNo())
+            .append("createTime", getCreateTime())
+            .append("createUserCode", getCreateUserCode())
+            .append("updateTime", getUpdateTime())
+            .append("updateUserCode", getUpdateUserCode())
+            .append("inboundOrderItemsList", getInboundOrderItemsList())
+            .toString();
+    }
+}

ruoyi-inventory/src/main/java/com/ruoyi/inventory/mapper/InboundOrderItemsMapper.java

+package com.ruoyi.inventory.mapper;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.InboundOrderItems;
+
+/**
+ * 入库单明细Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+public interface InboundOrderItemsMapper
+{
+    /**
+     * 查询入库单明细
+     *
+     * @param id 入库单明细主键
+     * @return 入库单明细
+     */
+    public InboundOrderItems selectInboundOrderItemsById(String id);
+
+    /**
+     * 查询入库单明细列表
+     *
+     * @param inboundOrderItems 入库单明细
+     * @return 入库单明细集合
+     */
+    public List<InboundOrderItems> selectInboundOrderItemsList(InboundOrderItems inboundOrderItems);
+
+    /**
+     * 新增入库单明细
+     *
+     * @param inboundOrderItems 入库单明细
+     * @return 结果
+     */
+    public int insertInboundOrderItems(InboundOrderItems inboundOrderItems);
+
+    /**
+     * 修改入库单明细
+     *
+     * @param inboundOrderItems 入库单明细
+     * @return 结果
+     */
+    public int updateInboundOrderItems(InboundOrderItems inboundOrderItems);
+
+    /**
+     * 删除入库单明细
+     *
+     * @param id 入库单明细主键
+     * @return 结果
+     */
+    public int deleteInboundOrderItemsById(String id);
+
+    /**
+     * 批量删除入库单明细
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInboundOrderItemsByIds(String[] ids);
+}

ruoyi-inventory/src/main/java/com/ruoyi/inventory/mapper/InboundOrdersMapper.java

+package com.ruoyi.inventory.mapper;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.InboundOrders;
+import com.ruoyi.inventory.domain.InboundOrderItems;
+
+/**
+ * 入库单主Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+public interface InboundOrdersMapper 
+{
+    /**
+     * 查询入库单主
+     * 
+     * @param id 入库单主主键
+     * @return 入库单主
+     */
+    public InboundOrders selectInboundOrdersById(String id);
+
+    /**
+     * 查询入库单主列表
+     * 
+     * @param inboundOrders 入库单主
+     * @return 入库单主集合
+     */
+    public List<InboundOrders> selectInboundOrdersList(InboundOrders inboundOrders);
+
+    /**
+     * 新增入库单主
+     * 
+     * @param inboundOrders 入库单主
+     * @return 结果
+     */
+    public int insertInboundOrders(InboundOrders inboundOrders);
+
+    /**
+     * 修改入库单主
+     * 
+     * @param inboundOrders 入库单主
+     * @return 结果
+     */
+    public int updateInboundOrders(InboundOrders inboundOrders);
+
+    /**
+     * 删除入库单主
+     * 
+     * @param id 入库单主主键
+     * @return 结果
+     */
+    public int deleteInboundOrdersById(String id);
+
+    /**
+     * 批量删除入库单主
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInboundOrdersByIds(String[] ids);
+
+    /**
+     * 批量删除入库单明细
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteInboundOrderItemsByOrderIds(String[] ids);
+    
+    /**
+     * 批量新增入库单明细
+     * 
+     * @param inboundOrderItemsList 入库单明细列表
+     * @return 结果
+     */
+    public int batchInboundOrderItems(List<InboundOrderItems> inboundOrderItemsList);
+    
+
+    /**
+     * 通过入库单主主键删除入库单明细信息
+     * 
+     * @param id 入库单主ID
+     * @return 结果
+     */
+    public int deleteInboundOrderItemsByOrderId(String id);
+}

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/IInboundOrderItemsService.java

+package com.ruoyi.inventory.service;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.InboundOrderItems;
+
+/**
+ * 入库单明细Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+public interface IInboundOrderItemsService 
+{
+    /**
+     * 查询入库单明细
+     * 
+     * @param id 入库单明细主键
+     * @return 入库单明细
+     */
+    public InboundOrderItems selectInboundOrderItemsById(String id);
+
+    /**
+     * 查询入库单明细列表
+     * 
+     * @param inboundOrderItems 入库单明细
+     * @return 入库单明细集合
+     */
+    public List<InboundOrderItems> selectInboundOrderItemsList(InboundOrderItems inboundOrderItems);
+
+    /**
+     * 新增入库单明细
+     * 
+     * @param inboundOrderItems 入库单明细
+     * @return 结果
+     */
+    public int insertInboundOrderItems(InboundOrderItems inboundOrderItems);
+
+    /**
+     * 修改入库单明细
+     * 
+     * @param inboundOrderItems 入库单明细
+     * @return 结果
+     */
+    public int updateInboundOrderItems(InboundOrderItems inboundOrderItems);
+
+    /**
+     * 批量删除入库单明细
+     * 
+     * @param ids 需要删除的入库单明细主键集合
+     * @return 结果
+     */
+    public int deleteInboundOrderItemsByIds(String[] ids);
+
+    /**
+     * 删除入库单明细信息
+     * 
+     * @param id 入库单明细主键
+     * @return 结果
+     */
+    public int deleteInboundOrderItemsById(String id);
+}

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/IInboundOrdersService.java

+package com.ruoyi.inventory.service;
+
+import java.util.List;
+import com.ruoyi.inventory.domain.InboundOrders;
+
+/**
+ * 入库单主Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+public interface IInboundOrdersService 
+{
+    /**
+     * 查询入库单主
+     * 
+     * @param id 入库单主主键
+     * @return 入库单主
+     */
+    public InboundOrders selectInboundOrdersById(String id);
+
+    /**
+     * 查询入库单主列表
+     * 
+     * @param inboundOrders 入库单主
+     * @return 入库单主集合
+     */
+    public List<InboundOrders> selectInboundOrdersList(InboundOrders inboundOrders);
+
+    /**
+     * 新增入库单主
+     * 
+     * @param inboundOrders 入库单主
+     * @return 结果
+     */
+    public int insertInboundOrders(InboundOrders inboundOrders);
+
+    /**
+     * 修改入库单主
+     * 
+     * @param inboundOrders 入库单主
+     * @return 结果
+     */
+    public int updateInboundOrders(InboundOrders inboundOrders);
+
+    /**
+     * 批量删除入库单主
+     * 
+     * @param ids 需要删除的入库单主主键集合
+     * @return 结果
+     */
+    public int deleteInboundOrdersByIds(String[] ids);
+
+    /**
+     * 删除入库单主信息
+     * 
+     * @param id 入库单主主键
+     * @return 结果
+     */
+    public int deleteInboundOrdersById(String id);
+}

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

+package com.ruoyi.inventory.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.inventory.mapper.InboundOrderItemsMapper;
+import com.ruoyi.inventory.domain.InboundOrderItems;
+import com.ruoyi.inventory.service.IInboundOrderItemsService;
+
+/**
+ * 入库单明细Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+@Service
+public class InboundOrderItemsServiceImpl implements IInboundOrderItemsService 
+{
+    @Autowired
+    private InboundOrderItemsMapper inboundOrderItemsMapper;
+
+    /**
+     * 查询入库单明细
+     * 
+     * @param id 入库单明细主键
+     * @return 入库单明细
+     */
+    @Override
+    public InboundOrderItems selectInboundOrderItemsById(String id)
+    {
+        return inboundOrderItemsMapper.selectInboundOrderItemsById(id);
+    }
+
+    /**
+     * 查询入库单明细列表
+     * 
+     * @param inboundOrderItems 入库单明细
+     * @return 入库单明细
+     */
+    @Override
+    public List<InboundOrderItems> selectInboundOrderItemsList(InboundOrderItems inboundOrderItems)
+    {
+        return inboundOrderItemsMapper.selectInboundOrderItemsList(inboundOrderItems);
+    }
+
+    /**
+     * 新增入库单明细
+     * 
+     * @param inboundOrderItems 入库单明细
+     * @return 结果
+     */
+    @Override
+    public int insertInboundOrderItems(InboundOrderItems inboundOrderItems)
+    {
+        inboundOrderItems.setCreateTime(DateUtils.getNowDate());
+        return inboundOrderItemsMapper.insertInboundOrderItems(inboundOrderItems);
+    }
+
+    /**
+     * 修改入库单明细
+     * 
+     * @param inboundOrderItems 入库单明细
+     * @return 结果
+     */
+    @Override
+    public int updateInboundOrderItems(InboundOrderItems inboundOrderItems)
+    {
+        inboundOrderItems.setUpdateTime(DateUtils.getNowDate());
+        return inboundOrderItemsMapper.updateInboundOrderItems(inboundOrderItems);
+    }
+
+    /**
+     * 批量删除入库单明细
+     * 
+     * @param ids 需要删除的入库单明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInboundOrderItemsByIds(String[] ids)
+    {
+        return inboundOrderItemsMapper.deleteInboundOrderItemsByIds(ids);
+    }
+
+    /**
+     * 删除入库单明细信息
+     * 
+     * @param id 入库单明细主键
+     * @return 结果
+     */
+    @Override
+    public int deleteInboundOrderItemsById(String id)
+    {
+        return inboundOrderItemsMapper.deleteInboundOrderItemsById(id);
+    }
+}

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

+package com.ruoyi.inventory.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.UUID;
+
+import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Transactional;
+import com.ruoyi.inventory.domain.InboundOrderItems;
+import com.ruoyi.inventory.mapper.InboundOrdersMapper;
+import com.ruoyi.inventory.domain.InboundOrders;
+import com.ruoyi.inventory.service.IInboundOrdersService;
+
+/**
+ * 入库单主Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-12-02
+ */
+@Service
+public class InboundOrdersServiceImpl implements IInboundOrdersService 
+{
+    @Autowired
+    private InboundOrdersMapper inboundOrdersMapper;
+
+    /**
+     * 查询入库单主
+     * 
+     * @param id 入库单主主键
+     * @return 入库单主
+     */
+    @Override
+    public InboundOrders selectInboundOrdersById(String id)
+    {
+        return inboundOrdersMapper.selectInboundOrdersById(id);
+    }
+
+    /**
+     * 查询入库单主列表
+     * 
+     * @param inboundOrders 入库单主
+     * @return 入库单主
+     */
+    @Override
+    public List<InboundOrders> selectInboundOrdersList(InboundOrders inboundOrders)
+    {
+        return inboundOrdersMapper.selectInboundOrdersList(inboundOrders);
+    }
+
+    /**
+     * 新增入库单主
+     * 
+     * @param inboundOrders 入库单主
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertInboundOrders(InboundOrders inboundOrders)
+    {
+        inboundOrders.setCreateTime(DateUtils.getNowDate());
+        int rows = inboundOrdersMapper.insertInboundOrders(inboundOrders);
+        insertInboundOrderItems(inboundOrders);
+        return rows;
+    }
+
+    /**
+     * 修改入库单主
+     * 
+     * @param inboundOrders 入库单主
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateInboundOrders(InboundOrders inboundOrders)
+    {
+        inboundOrders.setUpdateTime(DateUtils.getNowDate());
+        inboundOrdersMapper.deleteInboundOrderItemsByOrderId(inboundOrders.getId());
+        insertInboundOrderItems(inboundOrders);
+        return inboundOrdersMapper.updateInboundOrders(inboundOrders);
+    }
+
+    /**
+     * 批量删除入库单主
+     * 
+     * @param ids 需要删除的入库单主主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteInboundOrdersByIds(String[] ids)
+    {
+        inboundOrdersMapper.deleteInboundOrderItemsByOrderIds(ids);
+        return inboundOrdersMapper.deleteInboundOrdersByIds(ids);
+    }
+
+    /**
+     * 删除入库单主信息
+     * 
+     * @param id 入库单主主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteInboundOrdersById(String id)
+    {
+        inboundOrdersMapper.deleteInboundOrderItemsByOrderId(id);
+        return inboundOrdersMapper.deleteInboundOrdersById(id);
+    }
+
+    /**
+     * 新增入库单明细信息
+     * 
+     * @param inboundOrders 入库单主对象
+     */
+    public void insertInboundOrderItems(InboundOrders inboundOrders)
+    {
+        List<InboundOrderItems> inboundOrderItemsList = inboundOrders.getInboundOrderItemsList();
+        String orderId = inboundOrders.getOrderId();
+        if (StringUtils.isNotNull(inboundOrderItemsList))
+        {
+            List<InboundOrderItems> list = new ArrayList<InboundOrderItems>();
+            for (InboundOrderItems inboundOrderItems : inboundOrderItemsList)
+            {
+                inboundOrderItems.setId(UUID.randomUUID().toString());
+                inboundOrderItems.setOrderId(orderId);
+                list.add(inboundOrderItems);
+            }
+            if (list.size() > 0)
+            {
+                inboundOrdersMapper.batchInboundOrderItems(list);
+            }
+        }
+    }
+}