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

zkh
路明慧 11 months ago
parent f9e9f7e980
commit 8367545f1d
  1. 5
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/model/yy/YyOrderInfo.java
  2. 8
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java
  3. 6
      order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java
  4. 9
      order-management-order/src/main/resources/mybatis/mapper/YyOrderInfoMapper.xml
  5. 6
      order-management-order/src/main/resources/mybatis/mapper/YyOrderMapper.xml

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

@ -41,6 +41,7 @@ import com.github.pagehelper.PageInfo;
import com.github.pagehelper.page.PageMethod; import com.github.pagehelper.page.PageMethod;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -261,6 +262,7 @@ public class SkOrderServiceImpl implements OrderService {
BigDecimal hsje = new BigDecimal(ConfigureConstant.STRING_0); BigDecimal hsje = new BigDecimal(ConfigureConstant.STRING_0);
BigDecimal se = new BigDecimal(ConfigureConstant.STRING_0); BigDecimal se = new BigDecimal(ConfigureConstant.STRING_0);
StringBuilder bz = new StringBuilder();
for (SkOrderItemInfo skOrderItemInfo : skOrderItemInfoList) { for (SkOrderItemInfo skOrderItemInfo : skOrderItemInfoList) {
hsje = hsje.add(new BigDecimal(skOrderItemInfo.getHsje())); hsje = hsje.add(new BigDecimal(skOrderItemInfo.getHsje()));
se = se.add(new BigDecimal(skOrderItemInfo.getSe())); se = se.add(new BigDecimal(skOrderItemInfo.getSe()));
@ -269,6 +271,10 @@ public class SkOrderServiceImpl implements OrderService {
skOrderItemInfo.setCreateTime(now); skOrderItemInfo.setCreateTime(now);
skOrderItemInfo.setUpdateTime(now); skOrderItemInfo.setUpdateTime(now);
skOrderItemInfoMapper.insertSkOrderItemInfo(skOrderItemInfo); skOrderItemInfoMapper.insertSkOrderItemInfo(skOrderItemInfo);
if (StringUtils.isNotBlank(skOrderItemInfo.getBeizhu())){
bz.append(" ").append(skOrderItemInfo.getBeizhu());
}
} }
skOrderInfo.setId(orderId); skOrderInfo.setId(orderId);
@ -279,7 +285,7 @@ public class SkOrderServiceImpl implements OrderService {
skOrderInfo.setCreateTime(now); skOrderInfo.setCreateTime(now);
skOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString()); skOrderInfo.setHsje(hsje.setScale(ConfigureConstant.INT_2, RoundingMode.HALF_UP).toPlainString());
skOrderInfo.setSe(se.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; String fplx = ConfigureConstant.STRING_002;
if ("增值税专用发票".equals(skOrderInfo.getFplx())) { if ("增值税专用发票".equals(skOrderInfo.getFplx())) {
fplx = ConfigureConstant.STRING_001; fplx = ConfigureConstant.STRING_001;

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

@ -19,10 +19,11 @@
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="cdldate" column="cdldate"/> <result property="cdldate" column="cdldate"/>
<result property="bz" column="bz"/>
</resultMap> </resultMap>
<sql id="selectYyOrderInfoVo"> <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> </sql>
<insert id="insertYyOrderInfo" parameterType="com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderInfo"> <insert id="insertYyOrderInfo" parameterType="com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderInfo">
@ -85,6 +86,9 @@
<if test="yscdlcode != null"> <if test="yscdlcode != null">
yscdlcode, yscdlcode,
</if> </if>
<if test="bz != null">
bz,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null"> <if test="id != null">
@ -144,6 +148,9 @@
<if test="yscdlcode != null"> <if test="yscdlcode != null">
#{yscdlcode}, #{yscdlcode},
</if> </if>
<if test="bz != null">
#{bz},
</if>
</trim> </trim>
</insert> </insert>

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

Loading…
Cancel
Save