release:时空和用友展示添加备注

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/sk/SkOrderItemInfo.java

@@ -60,4 +60,9 @@ public class SkOrderItemInfo {
      * 相关单据编号
      */
     private String xgdjbh;
+
+    /**
+     * 备注
+     */
+    private String beizhu;
 }

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/yy/YyOrderInfo.java

@@ -89,4 +89,9 @@ public class YyOrderInfo {
      * 红字订单号
      */
     private String yscdlcode;
+
+    /**
+     * 备注
+     */
+    private String bz;
 }

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java

@@ -41,6 +41,7 @@ import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -261,6 +262,7 @@ public class SkOrderServiceImpl implements OrderService {
 
         BigDecimal hsje = new BigDecimal(ConfigureConstant.STRING_0);
         BigDecimal se = new BigDecimal(ConfigureConstant.STRING_0);
+        StringBuilder bz = new StringBuilder();
         for (SkOrderItemInfo skOrderItemInfo : skOrderItemInfoList) {
             hsje = hsje.add(new BigDecimal(skOrderItemInfo.getHsje()));
             se = se.add(new BigDecimal(skOrderItemInfo.getSe()));
@@ -269,6 +271,10 @@ public class SkOrderServiceImpl implements OrderService {
             skOrderItemInfo.setCreateTime(now);
             skOrderItemInfo.setUpdateTime(now);
             skOrderItemInfoMapper.insertSkOrderItemInfo(skOrderItemInfo);
+            if (StringUtils.isNotBlank(skOrderItemInfo.getBeizhu())){
+                bz.append(" ").append(skOrderItemInfo.getBeizhu());
+            }
+
         }
 
         skOrderInfo.setId(orderId);
@@ -279,7 +285,7 @@ public class SkOrderServiceImpl implements OrderService {
         skOrderInfo.setCreateTime(now);
         skOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
         skOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
-
+        skOrderInfo.setBz(bz.toString());
         String fplx = ConfigureConstant.STRING_002;
         if ("增值税专用发票".equals(skOrderInfo.getFplx())) {
             fplx = ConfigureConstant.STRING_001;
@@ -355,6 +361,7 @@ public class SkOrderServiceImpl implements OrderService {
             ddmxxxBO.setSE(new BigDecimal(orderItemInfo.getSe()).setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
             ddmxxxBO.setDJ(getDynamicLengthDecimal(ddmxxxBO.getJE(), ddmxxxBO.getSPSL()));
             ddmxxxBO.setFPHXZ(ConfigureConstant.STRING_0);
+            ddmxxxBO.setBZ(orderItemInfo.getBeizhu());
             ddmxxxBO.setHSBZ(ConfigureConstant.STRING_1);
             ddmxxxBO.setBYZD1(orderItemInfo.getHsdj());
             //累计求金额和税额

order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java

@@ -42,6 +42,7 @@ import com.github.pagehelper.page.PageMethod;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -295,6 +296,7 @@ public class YyOrderServiceImpl implements OrderService {
 
         BigDecimal hsje = new BigDecimal(ConfigureConstant.STRING_0);
         BigDecimal se = new BigDecimal(ConfigureConstant.STRING_0);
+        StringBuilder bz = new StringBuilder();
         for (YyOrderItemInfo yyOrderItemInfo : yyOrderItemInfoList) {
             hsje = hsje.add(new BigDecimal(yyOrderItemInfo.getIsum()));
             se = se.add(new BigDecimal(yyOrderItemInfo.getItax()));
@@ -303,6 +305,9 @@ public class YyOrderServiceImpl implements OrderService {
             yyOrderItemInfo.setCreateTime(now);
             yyOrderItemInfo.setUpdateTime(now);
             yyOrderItemInfoMapper.insertYyOrderItemInfo(yyOrderItemInfo);
+            if (StringUtils.isNotBlank(yyOrderItemInfo.getRemark())){
+                bz.append(" ").append(yyOrderItemInfo.getRemark());
+            }
         }
         yyOrderInfo.setId(orderId);
         yyOrderInfo.setNsrsbh(reqParam.getNsrsbh());
@@ -313,6 +318,7 @@ public class YyOrderServiceImpl implements OrderService {
         yyOrderInfo.setDetailCount(String.valueOf(yyOrderItemInfoList.size()));
         yyOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
         yyOrderInfo.setSe(se.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
+        yyOrderInfo.setBz(bz.toString());
         if (yyOrderInfo.getCvouchtype().equals(ConfigureConstant.STRING_26)) {
             yyOrderInfo.setCvouchtype(ConfigureConstant.STRING_001);
         }

order-management-order/src/main/resources/mybatis/mapper/SkOrderItemInfoMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
 
     <sql id="selectSkOrderItemInfoVo">
-        select id, order_id, cpmc, xh, cpdw, cpsl, hsdj, hsje, sl, se, create_time, update_time,xgdjbh from sk_order_item_info
+        select id, order_id, cpmc, xh, cpdw, cpsl, hsdj, hsje, sl, se, create_time, update_time,xgdjbh,beizhu from sk_order_item_info
     </sql>
 
     <insert id="insertSkOrderItemInfo" parameterType="com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo">
@@ -63,6 +63,9 @@
             <if test="xgdjbh != null">
                 xgdjbh,
             </if>
+            <if test="beizhu != null">
+                beizhu,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -104,6 +107,9 @@
             <if test="xgdjbh != null">
                 #{xgdjbh},
             </if>
+            <if test="beizhu != null">
+                #{beizhu},
+            </if>
         </trim>
     </insert>
 

order-management-order/src/main/resources/mybatis/mapper/SkOrderMapper.xml

@@ -31,6 +31,7 @@
                sl,
                xh,
                xgdjbh,
+               beizhu,
                se
         from v_invoice_detail_fp
         where xsddm = #{xsddm}

order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml

@@ -19,10 +19,11 @@
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
         <result property="cdldate" column="cdldate"/>
+        <result property="bz" column="bz"/>
     </resultMap>
 
     <sql id="selectYyOrderInfoVo">
-        select id, nsrsbh, ent_id, status, detail_count, hsje, se, cvouchtype, ccusregcode, ccusname, ccusaddress, branchaccount, cdlcode, cpznum, create_time, update_time, cdldate from yy_order_info
+        select id, nsrsbh, ent_id, status, detail_count, hsje, se, cvouchtype, ccusregcode, ccusname, ccusaddress, branchaccount, cdlcode, cpznum, create_time, update_time, cdldate,bz from yy_order_info
     </sql>
 
     <insert id="insertYyOrderInfo" parameterType="com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderInfo">
@@ -85,6 +86,9 @@
             <if test="yscdlcode != null">
                 yscdlcode,
             </if>
+            <if test="bz != null">
+                bz,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -144,6 +148,9 @@
             <if test="yscdlcode != null">
                 #{yscdlcode},
             </if>
+            <if test="bz != null">
+                #{bz},
+            </if>
         </trim>
     </insert>
 

order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml

@@ -13,7 +13,7 @@
                cpznum,
                sbvid,
                yscdlcode
-        from v_invoice_head
+        from v_invoice_head_sd
         <where>
             <if test="ddh != null and ddh != ''">
                 and cdlcode = #{ddh}
@@ -40,7 +40,7 @@
                itax,
                sbvid as yyItemId,
                remark
-        from v_invoice_detail
+        from v_invoice_detail_sd
         where sbvid = #{sbvid}
     </select>
 
@@ -57,7 +57,7 @@
 
     <select id="findBackDdh" resultType="java.lang.String" parameterType="java.lang.String">
         select cdlcode
-        from v_invoice_head
+        from v_invoice_head_sd
         where yscdlcode = #{ddh}
     </select>
 </mapper>