From e548b0e3ce1b4dea32bb9d5d8606ecf823496be2 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Wed, 15 May 2024 17:16:55 +0800
Subject: [PATCH] =?UTF-8?q?2024-5-15=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-=E4=BA=A7=E5=93=81-=E6=96=B0=E5=A2=9E=E9=99=84?=
 =?UTF-8?q?=E5=B1=9E=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/wms/controller/BaseProductAttachedController.java  | 2 +-
 .../wms/service/impl/BaseProductAttachedServiceImpl.java  | 2 ++
 .../resources/mapper/wms/BaseProductAttachedMapper.xml    | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java
index e2bfe0460..838b62471 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/BaseProductAttachedController.java
@@ -69,7 +69,7 @@ public class BaseProductAttachedController extends BaseController {
     /**
      * 新增物料附属信息
      */
-    @RequiresPermissions("wms:attached:add")
+    @RequiresPermissions("wms:attached:edit")
     @Log(title = "物料附属信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BaseProductAttached baseProductAttached) {
diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java
index 76c23d2db..28e09ab3b 100644
--- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java
+++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java
@@ -3,6 +3,7 @@ package com.op.wms.service.impl;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.common.core.utils.uuid.IdUtils;
 import com.op.wms.mapper.BaseProductAttachedMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +54,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi
     @Override
     @DS("#header.poolName")
     public int insertBaseProductAttached(BaseProductAttached baseProductAttached) {
+        baseProductAttached.setId(IdUtils.fastSimpleUUID());
         return baseProductAttachedMapper.insertBaseProductAttached(baseProductAttached);
     }
 
diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml
index 00dc9f7a0..81ecda8b0 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml
@@ -84,8 +84,8 @@
             <if test="productCode != null">product_code,</if>
             <if test="category != null">category,</if>
             <if test="pc != null">pc,</if>
-            <if test="iei != null">iei,</if>
-            <if test="manStandar != null">man_standar,</if>
+            iei,
+            man_standar,
             <if test="sprayWay != null">spray_way,</if>
             <if test="blankDiameter != null">blank_diameter,</if>
             <if test="blankNo != null">blank_no,</if>
@@ -104,8 +104,8 @@
             <if test="productCode != null">#{productCode},</if>
             <if test="category != null">#{category},</if>
             <if test="pc != null">#{pc},</if>
-            <if test="iei != null">#{iei},</if>
-            <if test="manStandar != null">#{manStandar},</if>
+            #{iei},
+            #{manStandar},
             <if test="sprayWay != null">#{sprayWay},</if>
             <if test="blankDiameter != null">#{blankDiameter},</if>
             <if test="blankNo != null">#{blankNo},</if>