申购单流转价格问题修复

src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java

@@ -1,16 +1,20 @@
 package com.glxp.api.controller.purchase;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.constant.ConstantType;
+import com.glxp.api.dao.basic.CompanyProductRelevanceDao;
 import com.glxp.api.entity.basic.BasicBusTypeChangeEntity;
 import com.glxp.api.entity.basic.BasicProductsEntity;
+import com.glxp.api.entity.basic.CompanyProductRelevanceEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inout.PurReceiveDetailEntity;
 import com.glxp.api.entity.inout.PurReceiveEntity;
 import com.glxp.api.entity.purchase.*;
+import com.glxp.api.service.basic.CompanyProductRelevanceService;
 import com.glxp.api.service.basic.IBasicBusTypeChangeService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderService;
@@ -24,6 +28,7 @@ import com.glxp.api.util.OrderNoTypeBean;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.awt.geom.QuadCurve2D;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
@@ -61,6 +66,8 @@ public class IoPurChangeService {
     IoOrderService ioOrderService;
     @Resource
     IoOrderDetailBizService ioOrderDetailBizService;
+    @Resource
+    CompanyProductRelevanceDao companyProductRelevanceDao;
 
     //领用单流转
     public void purReceiveChange(PurReceiveEntity purReceiveEntity) {
@@ -251,6 +258,14 @@ public class IoPurChangeService {
                         d.setCount(e.getCount());
                         d.setSupId(e.getSupId());
                         d.setZczbhhzbapzbh(e.getZczbhhzbapzbh());
+                        QueryWrapper<CompanyProductRelevanceEntity> ew = new QueryWrapper<>();
+                        ew.eq("customerId", d.getSupId());
+                        ew.eq("udiRlIdFk", d.getProductId());
+                        ew.last("limit 1");
+                        CompanyProductRelevanceEntity companyProductRelevanceEntity = companyProductRelevanceDao.selectOne(ew);
+                        if (companyProductRelevanceEntity != null) {
+                            d.setPrice(companyProductRelevanceEntity.getPrice());
+                        }
                         return d;
                     }).collect(Collectors.toList());
                     purOrderDetailService.insertPurOrderDetailEntity(purOrderDetailEntityList);
@@ -529,8 +544,8 @@ public class IoPurChangeService {
                     ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
                     ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
                     ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
-                    if (basicProductsEntity.getPrice() != null) {
-                        ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
+                    if (obj.getPrice() != null) {
+                        ioOrderDetailBizEntity.setPrice(obj.getPrice());
                     }
                     ioOrderDetailBizEntity.setSupId(obj.getSupId());
                     ioOrderDetailBizService.insert(ioOrderDetailBizEntity);

src/main/java/com/glxp/api/entity/thrsys/ThrProductsEntity.java

@@ -191,5 +191,10 @@ public class ThrProductsEntity {
     @TableField("supCode")
     private String supCode;
 
+    @TableField("type")
+    private Integer type;
+
+    @TableField(exist = false)
+    private String createByName;
 
 }

src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java

@@ -34,6 +34,7 @@ public class FilterThrProductsRequest extends ListPageRequest {
 
     private String uuid;
     private Integer diType;
+    private Integer type;
 
     public List<ThrProductsEntity> getThrProductsEntities() {
         return thrProductsEntities;

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -3,8 +3,9 @@
 <mapper namespace="com.glxp.api.dao.thrsys.ThrProductsDao">
     <select id="filterThrProducts" parameterType="com.glxp.api.req.thrsys.FilterThrProductsRequest"
             resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
-        SELECT *
+        SELECT *,cb.userName as createByName
         FROM thr_products
+        LEFT JOIN auth_user cb ON thr_products.createUser = cb.id
         <where>
             <if test="name != '' and name != null">
                 AND name LIKE concat('%', #{name}, '%')
@@ -42,6 +43,9 @@
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>
+            <if test="type != null">
+                AND type = #{type}
+            </if>
             <if test="lastUpdateTime != null and lastUpdateTime != ''">
                 <![CDATA[
                 and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')
@@ -167,7 +171,7 @@
                 (id, code, `name`, measname, spec, registerNo, manufactory,
                  cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
                  thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,
-                 price, createUser, createTime, updateUser, manufactoryCode, supCode)
+                 price, createUser, createTime, updateUser, manufactoryCode, supCode, type)
         values (#{id},
                 #{code},
                 #{name},
@@ -199,7 +203,7 @@
                 #{price},
                 #{createUser},
                 #{createTime},
-                #{updateUser}, #{manufactoryCode}, #{supCode})
+                #{updateUser}, #{manufactoryCode}, #{supCode},#{type})
     </insert>
 
     <select id="selectByLastTime" resultType="com.glxp.api.entity.thrsys.ThrProductsEntity">
@@ -215,7 +219,7 @@
                  cplb, flbm, qxlb, ybbm, sptm, tyshxydm, zczbhhzbapzbh, ylqxzcrbarmc, ylqxzcrbarywmc, cpms,
                  thirdSysFk, updateTime, supName, model, standard, qtbm, zczyxqz, remark, remark1, remark2, remark3,
                  price,
-                 createUser, createTime, updateUser, manufactoryCode, supCode)
+                 createUser, createTime, updateUser, manufactoryCode, supCode,type)
                 values
         <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
             #{item.code},
@@ -248,7 +252,7 @@
             #{item.price},
             #{item.createUser},
             #{item.createTime},
-            #{item.updateUser}, #{manufactoryCode}, #{supCode}
+            #{item.updateUser}, #{manufactoryCode}, #{supCode} , #{type}
         </foreach>
     </insert>
 
@@ -326,6 +330,7 @@
             price           = #{price,jdbcType=VARCHAR},
             manufactoryCode = #{manufactoryCode,jdbcType=VARCHAR},
             supCode         = #{supCode,jdbcType=VARCHAR}
+            type         = #{type,jdbcType=VARCHAR}
         </set>
         where id = #{id,jdbcType=INTEGER}
     </update>

src/main/resources/schemas/schema_v2.1.sql

@@ -68,7 +68,7 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'groupBuy', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'isDateBy', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'needCert', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'certIdFk', 'varchar(255)', 1);
-CALL Pro_Temp_ColumnWork('basic_udirel', 'zdcfsycs', 'int', 1);
+
 
 CALL Pro_Temp_ColumnWork('basic_products', 'allowNoSerial', 'tinyint', 1);
 
@@ -515,3 +515,19 @@ INSERT ignore INTO `sys_param_config`(id, `parentId`, `paramName`, `paramKey`, `
                                       `paramType`,
                                       `paramExplain`, `updateTime`)
 VALUES (20059, 0, '是否允许编辑第三方产品信息', 'enable_edit_third', '1', 0, 0, '0：否；1：是', NULL);
+
+CREATE TABLE if not exists `basic_destiny_rel`
+(
+    `id`    bigint(0) NOT NULL,
+    `relId` bigint(0) NULL DEFAULT NULL COMMENT '耗材产品id',
+    `pId`   bigint(0) NULL DEFAULT NULL COMMENT '定数包模板id',
+    `count` int(0)    NULL DEFAULT NULL COMMENT '数量',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci COMMENT = '定数包产品关联表'
+  ROW_FORMAT = Dynamic;
+
+
+CALL Pro_Temp_ColumnWork('thr_products', 'type', 'int', 1);
+