2024-5-15 基础信息-产品-修改产品附属属性

op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java

@@ -20,6 +20,8 @@ public class BaseProduct extends BaseEntity {
      * 主键ID
      */
     private String productId;
+    //附属属性表id
+    private String id;
 
     /**
      * 物料编码
@@ -481,11 +483,17 @@ public class BaseProduct extends BaseEntity {
     public void setProductId(String productId) {
         this.productId = productId;
     }
-
     public String getProductId() {
         return productId;
     }
 
+    public void setId(String id) {
+        this.id = id;
+    }
+    public String getId() {
+        return id;
+    }
+
     public void setProductCode(String productCode) {
         this.productCode = productCode;
     }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BaseProductAttachedServiceImpl.java

@@ -2,9 +2,10 @@ package com.op.wms.service.impl;
 
 import java.util.List;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.op.wms.mapper.BaseProductAttachedMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.op.wms.mapper.BaseProductAttachedMapper;
 import com.op.wms.domain.BaseProductAttached;
 import com.op.wms.service.IBaseProductAttachedService;
 
@@ -26,6 +27,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi
      * @return 物料附属信息
      */
     @Override
+    @DS("#header.poolName")
     public BaseProductAttached selectBaseProductAttachedById(String id) {
         return baseProductAttachedMapper.selectBaseProductAttachedById(id);
     }
@@ -37,6 +39,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi
      * @return 物料附属信息
      */
     @Override
+    @DS("#header.poolName")
     public List<BaseProductAttached> selectBaseProductAttachedList(BaseProductAttached baseProductAttached) {
         return baseProductAttachedMapper.selectBaseProductAttachedList(baseProductAttached);
     }
@@ -48,6 +51,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi
      * @return 结果
      */
     @Override
+    @DS("#header.poolName")
     public int insertBaseProductAttached(BaseProductAttached baseProductAttached) {
         return baseProductAttachedMapper.insertBaseProductAttached(baseProductAttached);
     }
@@ -59,6 +63,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi
      * @return 结果
      */
     @Override
+    @DS("#header.poolName")
     public int updateBaseProductAttached(BaseProductAttached baseProductAttached) {
         return baseProductAttachedMapper.updateBaseProductAttached(baseProductAttached);
     }
@@ -70,6 +75,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi
      * @return 结果
      */
     @Override
+    @DS("#header.poolName")
     public int deleteBaseProductAttachedByIds(String[] ids) {
         return baseProductAttachedMapper.deleteBaseProductAttachedByIds(ids);
     }
@@ -81,6 +87,7 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi
      * @return 结果
      */
     @Override
+    @DS("#header.poolName")
     public int deleteBaseProductAttachedById(String id) {
         return baseProductAttachedMapper.deleteBaseProductAttachedById(id);
     }

op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml

@@ -121,27 +121,35 @@
         </trim>
     </insert>
 
+<!--    <update id="updateBaseProductAttached" parameterType="BaseProductAttached">-->
+<!--        update base_product_attached-->
+<!--        <trim prefix="SET" suffixOverrides=",">-->
+<!--            <if test="productCode != null">product_code = #{productCode},</if>-->
+<!--            <if test="category != null">category = #{category},</if>-->
+<!--            <if test="pc != null">pc = #{pc},</if>-->
+<!--            <if test="iei != null">iei = #{iei},</if>-->
+<!--            <if test="manStandar != null">man_standar = #{manStandar},</if>-->
+<!--            <if test="sprayWay != null">spray_way = #{sprayWay},</if>-->
+<!--            <if test="blankDiameter != null">blank_diameter = #{blankDiameter},</if>-->
+<!--            <if test="blankNo != null">blank_no = #{blankNo},</if>-->
+<!--            <if test="sprayVolume != null">spray_volume = #{sprayVolume},</if>-->
+<!--            <if test="liquidNo != null">liquid_no = #{liquidNo},</if>-->
+<!--            <if test="endometrialDosage != null">endometrial_dosage = #{endometrialDosage},</if>-->
+<!--            <if test="outerFilmDosage != null">outer_film_dosage = #{outerFilmDosage},</if>-->
+<!--            <if test="support != null">support = #{support},</if>-->
+<!--            <if test="supportNo != null">support_no = #{supportNo},</if>-->
+<!--            <if test="pvc != null">pvc = #{pvc},</if>-->
+<!--            <if test="supportPlate != null">support_plate = #{supportPlate},</if>-->
+<!--            <if test="other != null">other = #{other},</if>-->
+<!--        </trim>-->
+<!--        where id = #{id}-->
+<!--    </update>-->
+
     <update id="updateBaseProductAttached" parameterType="BaseProductAttached">
         update base_product_attached
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="productCode != null">product_code = #{productCode},</if>
-            <if test="category != null">category = #{category},</if>
-            <if test="pc != null">pc = #{pc},</if>
-            <if test="iei != null">iei = #{iei},</if>
-            <if test="manStandar != null">man_standar = #{manStandar},</if>
-            <if test="sprayWay != null">spray_way = #{sprayWay},</if>
-            <if test="blankDiameter != null">blank_diameter = #{blankDiameter},</if>
-            <if test="blankNo != null">blank_no = #{blankNo},</if>
-            <if test="sprayVolume != null">spray_volume = #{sprayVolume},</if>
-            <if test="liquidNo != null">liquid_no = #{liquidNo},</if>
-            <if test="endometrialDosage != null">endometrial_dosage = #{endometrialDosage},</if>
-            <if test="outerFilmDosage != null">outer_film_dosage = #{outerFilmDosage},</if>
-            <if test="support != null">support = #{support},</if>
-            <if test="supportNo != null">support_no = #{supportNo},</if>
-            <if test="pvc != null">pvc = #{pvc},</if>
-            <if test="supportPlate != null">support_plate = #{supportPlate},</if>
-            <if test="other != null">other = #{other},</if>
-        </trim>
+        set
+            iei = #{iei},
+            man_standar = #{manStandar}
         where id = #{id}
     </update>
 

op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml

@@ -65,6 +65,8 @@
         <result property="supportPlate" column="support_plate"/>
         <result property="other" column="other"/>
         <result property="reportRate" column="report_rate"/>
+        <!--附属属性-->
+        <result property="id" column="id"/>
     </resultMap>
 
     <sql id="selectBaseProductVo">
@@ -163,6 +165,7 @@
 		bp.append_percent,
 		bp.mtart,
 		bp.report_rate,
+		bpa.id,
 		bpa.category,
 		bpa.pc,
 		bpa.iei,