bug修复

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/base/BaseSkuController.java

@@ -92,9 +92,9 @@ public class BaseSkuController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('base:baseSku:remove')")
     @Log(title = "物料信息", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{customerIds}")
-    public AjaxResult remove(@PathVariable String[] customerIds) {
-        return toAjax(baseSkuService.deleteBaseSkuByCustomerIds(customerIds));
+    @DeleteMapping("/{skus}")
+    public AjaxResult remove(@PathVariable String[] skus) {
+        return toAjax(baseSkuService.deleteBaseSkuBySkus(skus));
     }
 
     /**

ruoyi-ui/src/api/base/baseSku.js

@@ -36,9 +36,9 @@ export function updateBaseSku(data) {
 }
 
 // 删除物料信息
-export function delBaseSku(customerId) {
+export function delBaseSku(skus) {
   return request({
-    url: '/base/baseSku/' + customerId,
+    url: '/base/baseSku/' + skus,
     method: 'delete'
   })
 }

ruoyi-ui/src/views/base/baseSku/index.vue

@@ -1,15 +1,25 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="产品编号" prop="sku">
+      <el-form-item label="物料编号" prop="sku">
         <el-input
           v-model="queryParams.sku"
-          placeholder="请输入产品编号"
+          placeholder="请输入物料编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="物料分类" prop="skuType">
+        <el-select v-model="queryParams.skuType" placeholder="请选择物料分类" clearable size="small">
+          <el-option
+            v-for="dict in skuTypeCombo"
+            :key="dict.itemCode"
+            :label="dict.itemName"
+            :value="dict.itemCode"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否激活" prop="activeFlag">
         <el-select v-model="queryParams.activeFlag" placeholder="请选择是否激活" clearable size="small">
           <el-option
@@ -180,7 +190,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="物料编号" prop="sku">
-              <el-input v-model="form.sku" placeholder="请输入物料编号" />
+              <el-input :disabled="form.customerId != null" v-model="form.sku" placeholder="请输入物料编号" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -439,16 +449,16 @@ export default {
       // 表单校验
       rules: {
         sku: [
-          { required: true, message: "产品编号不能为空", trigger: "change" }
+          { required: true, message: "物料编号不能为空", trigger: "change" }
         ],
         skuType: [
-          { required: true, message: "产品分类不能为空", trigger: "change" }
+          { required: true, message: "物料分类不能为空", trigger: "change" }
         ],
         activeFlag: [
           { required: true, message: "是否激活不能为空", trigger: "change" }
         ],
         desc1: [
-          { required: true, message: "产品名称不能为空", trigger: "change" }
+          { required: true, message: "物料名称不能为空", trigger: "change" }
         ]
       },
       skuTypeCombo: []
@@ -546,7 +556,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.customerId)
+      this.ids = selection.map(item => item.sku)
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
@@ -566,6 +576,7 @@ export default {
         this.open = true;
         this.title = "修改物料信息";
       });
+
     },
     /** 提交按钮 */
     submitForm() {
@@ -589,9 +600,9 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const customerIds = row.customerId || this.ids;
-      this.$modal.confirm('是否确认删除物料信息编号为"' + customerIds + '"的数据项？').then(function() {
-        return delBaseSku(customerIds);
+      const skus = row.sku || this.ids;
+      this.$modal.confirm('是否确认删除物料信息编号为"' + skus + '"的数据项？').then(function() {
+        return delBaseSku(skus);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");

warewms-base/src/main/java/com/ruoyi/base/mapper/BaseSkuMapper.java

@@ -55,10 +55,10 @@ public interface BaseSkuMapper
     /**
      * 批量删除物料信息
      * 
-     * @param customerIds 需要删除的数据主键集合
+     * @param skus 需要删除的数据主键集合
      * @return 结果
      */
-     int deleteBaseSkuByCustomerIds(String[] customerIds);
+     int deleteBaseSkuBySkus(String[] skus);
 
     /**
      * 根据物料类型查询物料

warewms-base/src/main/java/com/ruoyi/base/service/IBaseSkuService.java

@@ -46,10 +46,10 @@ public interface IBaseSkuService
     /**
      * 批量删除物料信息
      * 
-     * @param customerIds 需要删除的物料信息主键集合
+     * @param skus 需要删除的物料信息主键集合
      * @return 结果
      */
-     int deleteBaseSkuByCustomerIds(String[] customerIds);
+     int deleteBaseSkuBySkus(String[] skus);
 
     /**
      * 删除物料信息信息

warewms-base/src/main/java/com/ruoyi/base/service/impl/BaseSkuServiceImpl.java

@@ -74,13 +74,13 @@ public class BaseSkuServiceImpl implements IBaseSkuService
     /**
      * 批量删除物料信息
      * 
-     * @param customerIds 需要删除的物料信息主键
+     * @param skus 需要删除的物料信息主键
      * @return 结果
      */
     @Override
-    public int deleteBaseSkuByCustomerIds(String[] customerIds)
+    public int deleteBaseSkuBySkus(String[] skus)
     {
-        return baseSkuMapper.deleteBaseSkuByCustomerIds(customerIds);
+        return baseSkuMapper.deleteBaseSkuBySkus(skus);
     }
 
     /**

warewms-base/src/main/resources/mapper/base/BaseSkuMapper.xml

@@ -244,17 +244,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
         </trim>
-        where customer_id = #{customerId}
+        where customer_id = #{customerId} and sku = #{sku}
     </update>
 
     <delete id="deleteBaseSkuByCustomerId" parameterType="String">
         delete from base_sku where customer_id = #{customerId}
     </delete>
 
-    <delete id="deleteBaseSkuByCustomerIds" parameterType="String">
-        delete from base_sku where customer_id in 
-        <foreach item="customerId" collection="array" open="(" separator="," close=")">
-            #{customerId}
+    <delete id="deleteBaseSkuBySkus" parameterType="String">
+        delete from base_sku where sku in
+        <foreach item="sku" collection="array" open="(" separator="," close=")">
+            #{sku}
         </foreach>
     </delete>