From f13ce73f4fed57d58c8037b7012f44e1fd6ea84f Mon Sep 17 00:00:00 2001 From: A0010407 Date: Wed, 15 May 2024 16:08:22 +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-=E4=BF=AE=E6=94=B9=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/wms/domain/BaseProduct.java | 10 +++- .../impl/BaseProductAttachedServiceImpl.java | 9 +++- .../mapper/wms/BaseProductAttachedMapper.xml | 46 +++++++++++-------- .../mapper/wms/BaseProductMapper.xml | 3 ++ 4 files changed, 47 insertions(+), 21 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java index d326c2be..d6e9580b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/BaseProduct.java +++ b/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; } 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 f071c4db..76c23d2d 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 @@ -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 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); } 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 fe78a321..00dc9f7a 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 @@ -121,27 +121,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + update base_product_attached - - product_code = #{productCode}, - category = #{category}, - pc = #{pc}, - iei = #{iei}, - man_standar = #{manStandar}, - spray_way = #{sprayWay}, - blank_diameter = #{blankDiameter}, - blank_no = #{blankNo}, - spray_volume = #{sprayVolume}, - liquid_no = #{liquidNo}, - endometrial_dosage = #{endometrialDosage}, - outer_film_dosage = #{outerFilmDosage}, - support = #{support}, - support_no = #{supportNo}, - pvc = #{pvc}, - support_plate = #{supportPlate}, - other = #{other}, - + set + iei = #{iei}, + man_standar = #{manStandar} where id = #{id} diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml index fce5f508..470477fd 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductMapper.xml @@ -65,6 +65,8 @@ + + @@ -163,6 +165,7 @@ bp.append_percent, bp.mtart, bp.report_rate, + bpa.id, bpa.category, bpa.pc, bpa.iei,