入库结合物料组件

ruoyi-admin-vue/src/views/inventory/materials/index.vue

@@ -143,8 +143,8 @@
             <!-- 表格列保持不变 -->
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column type="index" label="序号" align="center"/>
-            <el-table-column label="物料编码" align="center" prop="materialCode" />
-            <el-table-column label="物料名称" align="center" prop="materialName" />
+            <el-table-column label="物料编码" align="center" prop="materialCode" width="120"/>
+            <el-table-column label="物料名称" align="center" prop="materialName"  width="150"/>
             <el-table-column label="SAP物料号" align="center" prop="sapNo" />
             <el-table-column label="TS Code" align="center" prop="tsCode" />
             <el-table-column label="物料分类" align="center" prop="categoryCode" >

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

@@ -83,10 +83,10 @@ public class InboundOrdersController extends BaseController
     }
 
     /**
-     * 修改入库单主
+     * 修改入库单
      */
     @PreAuthorize("@ss.hasPermi('inventory:inbound:edit')")
-    @Log(title = "入库单主", businessType = BusinessType.UPDATE)
+    @Log(title = "入库单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody InboundOrders inboundOrders)
     {
@@ -94,10 +94,10 @@ public class InboundOrdersController extends BaseController
     }
 
     /**
-     * 删除入库单主
+     * 删除入库单
      */
     @PreAuthorize("@ss.hasPermi('inventory:inbound:remove')")
-    @Log(title = "入库单主", businessType = BusinessType.DELETE)
+    @Log(title = "入库单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {

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

@@ -77,7 +77,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
     public int updateInboundOrders(InboundOrders inboundOrders)
     {
         inboundOrders.setUpdateTime(DateUtils.getNowDate());
-        inboundOrdersMapper.deleteInboundOrderItemsByOrderId(inboundOrders.getId());
+        inboundOrdersMapper.deleteInboundOrderItemsByOrderId(inboundOrders.getOrderId());
         insertInboundOrderItems(inboundOrders);
         return inboundOrdersMapper.updateInboundOrders(inboundOrders);
     }