hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

文档添加关于字符串、字节和void数据类型的说明 

在NumPy文档中，常规介绍部分现在包含了关于字符串、字节和void数据类型的信息，以及现有的数值类型。
This commit is contained in:
liuy 2024-09-20 14:23:44 +08:00
parent 6ffd5b765a
commit d661158240
17 changed files with 849 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildpackage/src/main/java/com/hzya/frame/plugin/lets/constant/OverallConstant.java
View File

@ -91,6 +91,7 @@ public class OverallConstant {
devOverAll.put("u8c自定义项档案-店铺主键", "0001A110000000000EBX"); devOverAll.put("u8c自定义项档案-店铺主键", "0001A110000000000EBX");
devOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU"); devOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU");
devOverAll.put("u8c自定义项档案-存货分类对应收支项目主键", "0001A210000000008FBN");
//中台地址 //中台地址
devOverAll.put("u8c_url", "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface"); devOverAll.put("u8c_url", "http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface");
@ -117,6 +118,7 @@ public class OverallConstant {
prodOverAll.put("u8c自定义项档案-店铺主键", "0001A110000000000EBX"); prodOverAll.put("u8c自定义项档案-店铺主键", "0001A110000000000EBX");
prodOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU"); prodOverAll.put("u8c自定义项档案-平台主键", "0001A110000000000EEU");
prodOverAll.put("u8c自定义项档案-存货分类对应收支项目主键", "0001A210000000008FBN");
//中台地址 //中台地址
prodOverAll.put("u8c_url", "http://127.0.0.1:8081/kangarooDataCenterV3/entranceController/externalCallInterface"); prodOverAll.put("u8c_url", "http://127.0.0.1:8081/kangarooDataCenterV3/entranceController/externalCallInterface");

14
buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/IBdCostsubjDao.java Normal file
View File

@ -0,0 +1,14 @@
package com.hzya.frame.plugin.lets.dao;
import com.hzya.frame.plugin.lets.entity.BdCostsubjEntity;
import com.hzya.frame.basedao.dao.IBaseDao;
/**
* (BD_COSTSUBJ: table)表数据库访问层
*
* @author makejava
* @since 2024-09-20 13:39:58
*/
public interface IBdCostsubjDao extends IBaseDao<BdCostsubjEntity, String> {
}

16
buildpackage/src/main/java/com/hzya/frame/plugin/lets/dao/impl/BdCostsubjDaoImpl.java Normal file
View File

@ -0,0 +1,16 @@
package com.hzya.frame.plugin.lets.dao.impl;
import com.hzya.frame.plugin.lets.entity.BdCostsubjEntity;
import com.hzya.frame.plugin.lets.dao.IBdCostsubjDao;
import org.springframework.stereotype.Repository;
import com.hzya.frame.basedao.dao.MybatisGenericDao;
/**
* (BdCostsubj)表数据库访问层
*
* @author makejava
* @since 2024-09-20 13:39:58
*/
public class BdCostsubjDaoImpl extends MybatisGenericDao<BdCostsubjEntity, String> implements IBdCostsubjDao{
}

331
buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCostsubjEntity.java Normal file
View File

@ -0,0 +1,331 @@
package com.hzya.frame.plugin.lets.entity;
import com.hzya.frame.web.entity.BaseEntity;
/**
* (BdCostsubj)实体类
*
* @author makejava
* @since 2024-09-20 13:39:58
*/
public class BdCostsubjEntity extends BaseEntity {
private String costcode;
private String costname;
private String creatorcorp;
private String def1;
private String def2;
private String def3;
private String def4;
private String def5;
private String dr;
private String free1;
private String free10;
private String free2;
private String free3;
private String free4;
private String free5;
private String free6;
private String free7;
private String free8;
private String free9;
private String incomeflag;
private String ioflag;
private String isactiveappr;
private String isbalancesubj;
private String isexpensepro;
private String memo;
private String mnecode;
private String outflag;
private String pkBalancesubj;
private String pkCashflow;
private String pkCorp;
private String pkCostsubj;
private String pkParent;
private String pkSource;
private String sealflag;
private String ts;
public String getCostcode() {
return costcode;
}
public void setCostcode(String costcode) {
this.costcode = costcode;
}
public String getCostname() {
return costname;
}
public void setCostname(String costname) {
this.costname = costname;
}
public String getCreatorcorp() {
return creatorcorp;
}
public void setCreatorcorp(String creatorcorp) {
this.creatorcorp = creatorcorp;
}
public String getDef1() {
return def1;
}
public void setDef1(String def1) {
this.def1 = def1;
}
public String getDef2() {
return def2;
}
public void setDef2(String def2) {
this.def2 = def2;
}
public String getDef3() {
return def3;
}
public void setDef3(String def3) {
this.def3 = def3;
}
public String getDef4() {
return def4;
}
public void setDef4(String def4) {
this.def4 = def4;
}
public String getDef5() {
return def5;
}
public void setDef5(String def5) {
this.def5 = def5;
}
public String getDr() {
return dr;
}
public void setDr(String dr) {
this.dr = dr;
}
public String getFree1() {
return free1;
}
public void setFree1(String free1) {
this.free1 = free1;
}
public String getFree10() {
return free10;
}
public void setFree10(String free10) {
this.free10 = free10;
}
public String getFree2() {
return free2;
}
public void setFree2(String free2) {
this.free2 = free2;
}
public String getFree3() {
return free3;
}
public void setFree3(String free3) {
this.free3 = free3;
}
public String getFree4() {
return free4;
}
public void setFree4(String free4) {
this.free4 = free4;
}
public String getFree5() {
return free5;
}
public void setFree5(String free5) {
this.free5 = free5;
}
public String getFree6() {
return free6;
}
public void setFree6(String free6) {
this.free6 = free6;
}
public String getFree7() {
return free7;
}
public void setFree7(String free7) {
this.free7 = free7;
}
public String getFree8() {
return free8;
}
public void setFree8(String free8) {
this.free8 = free8;
}
public String getFree9() {
return free9;
}
public void setFree9(String free9) {
this.free9 = free9;
}
public String getIncomeflag() {
return incomeflag;
}
public void setIncomeflag(String incomeflag) {
this.incomeflag = incomeflag;
}
public String getIoflag() {
return ioflag;
}
public void setIoflag(String ioflag) {
this.ioflag = ioflag;
}
public String getIsactiveappr() {
return isactiveappr;
}
public void setIsactiveappr(String isactiveappr) {
this.isactiveappr = isactiveappr;
}
public String getIsbalancesubj() {
return isbalancesubj;
}
public void setIsbalancesubj(String isbalancesubj) {
this.isbalancesubj = isbalancesubj;
}
public String getIsexpensepro() {
return isexpensepro;
}
public void setIsexpensepro(String isexpensepro) {
this.isexpensepro = isexpensepro;
}
public String getMemo() {
return memo;
}
public void setMemo(String memo) {
this.memo = memo;
}
public String getMnecode() {
return mnecode;
}
public void setMnecode(String mnecode) {
this.mnecode = mnecode;
}
public String getOutflag() {
return outflag;
}
public void setOutflag(String outflag) {
this.outflag = outflag;
}
public String getPkBalancesubj() {
return pkBalancesubj;
}
public void setPkBalancesubj(String pkBalancesubj) {
this.pkBalancesubj = pkBalancesubj;
}
public String getPkCashflow() {
return pkCashflow;
}
public void setPkCashflow(String pkCashflow) {
this.pkCashflow = pkCashflow;
}
public String getPkCorp() {
return pkCorp;
}
public void setPkCorp(String pkCorp) {
this.pkCorp = pkCorp;
}
public String getPkCostsubj() {
return pkCostsubj;
}
public void setPkCostsubj(String pkCostsubj) {
this.pkCostsubj = pkCostsubj;
}
public String getPkParent() {
return pkParent;
}
public void setPkParent(String pkParent) {
this.pkParent = pkParent;
}
public String getPkSource() {
return pkSource;
}
public void setPkSource(String pkSource) {
this.pkSource = pkSource;
}
public String getSealflag() {
return sealflag;
}
public void setSealflag(String sealflag) {
this.sealflag = sealflag;
}
public String getTs() {
return ts;
}
public void setTs(String ts) {
this.ts = ts;
}
}

266
buildpackage/src/main/java/com/hzya/frame/plugin/lets/entity/BdCostsubjEntity.xml Normal file
View File

@ -0,0 +1,266 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.plugin.lets.dao.impl.BdCostsubjDaoImpl">
<resultMap id="get-BdCostsubjEntity-result" type="com.hzya.frame.plugin.lets.entity.BdCostsubjEntity" >
<result property="costcode" column="COSTCODE" jdbcType="VARCHAR"/>
<result property="costname" column="COSTNAME" jdbcType="VARCHAR"/>
<result property="creatorcorp" column="CREATORCORP" jdbcType="VARCHAR"/>
<result property="def1" column="DEF1" jdbcType="VARCHAR"/>
<result property="def2" column="DEF2" jdbcType="VARCHAR"/>
<result property="def3" column="DEF3" jdbcType="VARCHAR"/>
<result property="def4" column="DEF4" jdbcType="VARCHAR"/>
<result property="def5" column="DEF5" jdbcType="VARCHAR"/>
<result property="dr" column="DR" jdbcType="VARCHAR"/>
<result property="free1" column="FREE1" jdbcType="VARCHAR"/>
<result property="free10" column="FREE10" jdbcType="VARCHAR"/>
<result property="free2" column="FREE2" jdbcType="VARCHAR"/>
<result property="free3" column="FREE3" jdbcType="VARCHAR"/>
<result property="free4" column="FREE4" jdbcType="VARCHAR"/>
<result property="free5" column="FREE5" jdbcType="VARCHAR"/>
<result property="free6" column="FREE6" jdbcType="VARCHAR"/>
<result property="free7" column="FREE7" jdbcType="VARCHAR"/>
<result property="free8" column="FREE8" jdbcType="VARCHAR"/>
<result property="free9" column="FREE9" jdbcType="VARCHAR"/>
<result property="incomeflag" column="INCOMEFLAG" jdbcType="VARCHAR"/>
<result property="ioflag" column="IOFLAG" jdbcType="VARCHAR"/>
<result property="isactiveappr" column="ISACTIVEAPPR" jdbcType="VARCHAR"/>
<result property="isbalancesubj" column="ISBALANCESUBJ" jdbcType="VARCHAR"/>
<result property="isexpensepro" column="ISEXPENSEPRO" jdbcType="VARCHAR"/>
<result property="memo" column="MEMO" jdbcType="VARCHAR"/>
<result property="mnecode" column="MNECODE" jdbcType="VARCHAR"/>
<result property="outflag" column="OUTFLAG" jdbcType="VARCHAR"/>
<result property="pkBalancesubj" column="PK_BALANCESUBJ" jdbcType="VARCHAR"/>
<result property="pkCashflow" column="PK_CASHFLOW" jdbcType="VARCHAR"/>
<result property="pkCorp" column="PK_CORP" jdbcType="VARCHAR"/>
<result property="pkCostsubj" column="PK_COSTSUBJ" jdbcType="VARCHAR"/>
<result property="pkParent" column="PK_PARENT" jdbcType="VARCHAR"/>
<result property="pkSource" column="PK_SOURCE" jdbcType="VARCHAR"/>
<result property="sealflag" column="SEALFLAG" jdbcType="VARCHAR"/>
<result property="ts" column="TS" jdbcType="VARCHAR"/>
</resultMap>
<!-- 查询的字段-->
<sql id = "BdCostsubjEntity_Base_Column_List">
COSTCODE
,COSTNAME
,CREATORCORP
,DEF1
,DEF2
,DEF3
,DEF4
,DEF5
,DR
,FREE1
,FREE10
,FREE2
,FREE3
,FREE4
,FREE5
,FREE6
,FREE7
,FREE8
,FREE9
,INCOMEFLAG
,IOFLAG
,ISACTIVEAPPR
,ISBALANCESUBJ
,ISEXPENSEPRO
,MEMO
,MNECODE
,OUTFLAG
,PK_BALANCESUBJ
,PK_CASHFLOW
,PK_CORP
,PK_COSTSUBJ
,PK_PARENT
,PK_SOURCE
,SEALFLAG
,TS
</sql>
<!-- 查询 采用==查询 -->
<select id="entity_list_base" resultMap="get-BdCostsubjEntity-result" parameterType = "com.hzya.frame.plugin.lets.entity.BdCostsubjEntity">
select
<include refid="BdCostsubjEntity_Base_Column_List" />
from BD_COSTSUBJ
<trim prefix="where" prefixOverrides="and">
<if test="costcode != null and costcode != ''"> and COSTCODE = #{costcode} </if>
<if test="costname != null and costname != ''"> and COSTNAME = #{costname} </if>
<if test="creatorcorp != null and creatorcorp != ''"> and CREATORCORP = #{creatorcorp} </if>
<if test="def1 != null and def1 != ''"> and DEF1 = #{def1} </if>
<if test="def2 != null and def2 != ''"> and DEF2 = #{def2} </if>
<if test="def3 != null and def3 != ''"> and DEF3 = #{def3} </if>
<if test="def4 != null and def4 != ''"> and DEF4 = #{def4} </if>
<if test="def5 != null and def5 != ''"> and DEF5 = #{def5} </if>
<if test="dr != null and dr != ''"> and DR = #{dr} </if>
<if test="free1 != null and free1 != ''"> and FREE1 = #{free1} </if>
<if test="free10 != null and free10 != ''"> and FREE10 = #{free10} </if>
<if test="free2 != null and free2 != ''"> and FREE2 = #{free2} </if>
<if test="free3 != null and free3 != ''"> and FREE3 = #{free3} </if>
<if test="free4 != null and free4 != ''"> and FREE4 = #{free4} </if>
<if test="free5 != null and free5 != ''"> and FREE5 = #{free5} </if>
<if test="free6 != null and free6 != ''"> and FREE6 = #{free6} </if>
<if test="free7 != null and free7 != ''"> and FREE7 = #{free7} </if>
<if test="free8 != null and free8 != ''"> and FREE8 = #{free8} </if>
<if test="free9 != null and free9 != ''"> and FREE9 = #{free9} </if>
<if test="incomeflag != null and incomeflag != ''"> and INCOMEFLAG = #{incomeflag} </if>
<if test="ioflag != null and ioflag != ''"> and IOFLAG = #{ioflag} </if>
<if test="isactiveappr != null and isactiveappr != ''"> and ISACTIVEAPPR = #{isactiveappr} </if>
<if test="isbalancesubj != null and isbalancesubj != ''"> and ISBALANCESUBJ = #{isbalancesubj} </if>
<if test="isexpensepro != null and isexpensepro != ''"> and ISEXPENSEPRO = #{isexpensepro} </if>
<if test="memo != null and memo != ''"> and MEMO = #{memo} </if>
<if test="mnecode != null and mnecode != ''"> and MNECODE = #{mnecode} </if>
<if test="outflag != null and outflag != ''"> and OUTFLAG = #{outflag} </if>
<if test="pkBalancesubj != null and pkBalancesubj != ''"> and PK_BALANCESUBJ = #{pkBalancesubj} </if>
<if test="pkCashflow != null and pkCashflow != ''"> and PK_CASHFLOW = #{pkCashflow} </if>
<if test="pkCorp != null and pkCorp != ''"> and PK_CORP = #{pkCorp} </if>
<if test="pkCostsubj != null and pkCostsubj != ''"> and PK_COSTSUBJ = #{pkCostsubj} </if>
<if test="pkParent != null and pkParent != ''"> and PK_PARENT = #{pkParent} </if>
<if test="pkSource != null and pkSource != ''"> and PK_SOURCE = #{pkSource} </if>
<if test="sealflag != null and sealflag != ''"> and SEALFLAG = #{sealflag} </if>
<if test="ts != null and ts != ''"> and TS = #{ts} </if>
-- and sts='Y'
</trim>
<!-- <if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>-->
<!-- <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>-->
</select>
<!-- 查询符合条件的数量 -->
<select id="entity_count" resultType="Integer" parameterType = "com.hzya.frame.plugin.lets.entity.BdCostsubjEntity">
select count(1) from BD_COSTSUBJ
<trim prefix="where" prefixOverrides="and">
<if test="costcode != null and costcode != ''"> and COSTCODE = #{costcode} </if>
<if test="costname != null and costname != ''"> and COSTNAME = #{costname} </if>
<if test="creatorcorp != null and creatorcorp != ''"> and CREATORCORP = #{creatorcorp} </if>
<if test="def1 != null and def1 != ''"> and DEF1 = #{def1} </if>
<if test="def2 != null and def2 != ''"> and DEF2 = #{def2} </if>
<if test="def3 != null and def3 != ''"> and DEF3 = #{def3} </if>
<if test="def4 != null and def4 != ''"> and DEF4 = #{def4} </if>
<if test="def5 != null and def5 != ''"> and DEF5 = #{def5} </if>
<if test="dr != null and dr != ''"> and DR = #{dr} </if>
<if test="free1 != null and free1 != ''"> and FREE1 = #{free1} </if>
<if test="free10 != null and free10 != ''"> and FREE10 = #{free10} </if>
<if test="free2 != null and free2 != ''"> and FREE2 = #{free2} </if>
<if test="free3 != null and free3 != ''"> and FREE3 = #{free3} </if>
<if test="free4 != null and free4 != ''"> and FREE4 = #{free4} </if>
<if test="free5 != null and free5 != ''"> and FREE5 = #{free5} </if>
<if test="free6 != null and free6 != ''"> and FREE6 = #{free6} </if>
<if test="free7 != null and free7 != ''"> and FREE7 = #{free7} </if>
<if test="free8 != null and free8 != ''"> and FREE8 = #{free8} </if>
<if test="free9 != null and free9 != ''"> and FREE9 = #{free9} </if>
<if test="incomeflag != null and incomeflag != ''"> and INCOMEFLAG = #{incomeflag} </if>
<if test="ioflag != null and ioflag != ''"> and IOFLAG = #{ioflag} </if>
<if test="isactiveappr != null and isactiveappr != ''"> and ISACTIVEAPPR = #{isactiveappr} </if>
<if test="isbalancesubj != null and isbalancesubj != ''"> and ISBALANCESUBJ = #{isbalancesubj} </if>
<if test="isexpensepro != null and isexpensepro != ''"> and ISEXPENSEPRO = #{isexpensepro} </if>
<if test="memo != null and memo != ''"> and MEMO = #{memo} </if>
<if test="mnecode != null and mnecode != ''"> and MNECODE = #{mnecode} </if>
<if test="outflag != null and outflag != ''"> and OUTFLAG = #{outflag} </if>
<if test="pkBalancesubj != null and pkBalancesubj != ''"> and PK_BALANCESUBJ = #{pkBalancesubj} </if>
<if test="pkCashflow != null and pkCashflow != ''"> and PK_CASHFLOW = #{pkCashflow} </if>
<if test="pkCorp != null and pkCorp != ''"> and PK_CORP = #{pkCorp} </if>
<if test="pkCostsubj != null and pkCostsubj != ''"> and PK_COSTSUBJ = #{pkCostsubj} </if>
<if test="pkParent != null and pkParent != ''"> and PK_PARENT = #{pkParent} </if>
<if test="pkSource != null and pkSource != ''"> and PK_SOURCE = #{pkSource} </if>
<if test="sealflag != null and sealflag != ''"> and SEALFLAG = #{sealflag} </if>
<if test="ts != null and ts != ''"> and TS = #{ts} </if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null "> order by ${sort} ${order}</if>
</select>
<!-- 分页查询列表 采用like格式 -->
<select id="entity_list_like" resultMap="get-BdCostsubjEntity-result" parameterType = "com.hzya.frame.plugin.lets.entity.BdCostsubjEntity">
select
<include refid="BdCostsubjEntity_Base_Column_List" />
from BD_COSTSUBJ
<trim prefix="where" prefixOverrides="and">
<if test="costcode != null and costcode != ''"> and COSTCODE like concat('%',#{costcode},'%') </if>
<if test="costname != null and costname != ''"> and COSTNAME like concat('%',#{costname},'%') </if>
<if test="creatorcorp != null and creatorcorp != ''"> and CREATORCORP like concat('%',#{creatorcorp},'%') </if>
<if test="def1 != null and def1 != ''"> and DEF1 like concat('%',#{def1},'%') </if>
<if test="def2 != null and def2 != ''"> and DEF2 like concat('%',#{def2},'%') </if>
<if test="def3 != null and def3 != ''"> and DEF3 like concat('%',#{def3},'%') </if>
<if test="def4 != null and def4 != ''"> and DEF4 like concat('%',#{def4},'%') </if>
<if test="def5 != null and def5 != ''"> and DEF5 like concat('%',#{def5},'%') </if>
<if test="dr != null and dr != ''"> and DR like concat('%',#{dr},'%') </if>
<if test="free1 != null and free1 != ''"> and FREE1 like concat('%',#{free1},'%') </if>
<if test="free10 != null and free10 != ''"> and FREE10 like concat('%',#{free10},'%') </if>
<if test="free2 != null and free2 != ''"> and FREE2 like concat('%',#{free2},'%') </if>
<if test="free3 != null and free3 != ''"> and FREE3 like concat('%',#{free3},'%') </if>
<if test="free4 != null and free4 != ''"> and FREE4 like concat('%',#{free4},'%') </if>
<if test="free5 != null and free5 != ''"> and FREE5 like concat('%',#{free5},'%') </if>
<if test="free6 != null and free6 != ''"> and FREE6 like concat('%',#{free6},'%') </if>
<if test="free7 != null and free7 != ''"> and FREE7 like concat('%',#{free7},'%') </if>
<if test="free8 != null and free8 != ''"> and FREE8 like concat('%',#{free8},'%') </if>
<if test="free9 != null and free9 != ''"> and FREE9 like concat('%',#{free9},'%') </if>
<if test="incomeflag != null and incomeflag != ''"> and INCOMEFLAG like concat('%',#{incomeflag},'%') </if>
<if test="ioflag != null and ioflag != ''"> and IOFLAG like concat('%',#{ioflag},'%') </if>
<if test="isactiveappr != null and isactiveappr != ''"> and ISACTIVEAPPR like concat('%',#{isactiveappr},'%') </if>
<if test="isbalancesubj != null and isbalancesubj != ''"> and ISBALANCESUBJ like concat('%',#{isbalancesubj},'%') </if>
<if test="isexpensepro != null and isexpensepro != ''"> and ISEXPENSEPRO like concat('%',#{isexpensepro},'%') </if>
<if test="memo != null and memo != ''"> and MEMO like concat('%',#{memo},'%') </if>
<if test="mnecode != null and mnecode != ''"> and MNECODE like concat('%',#{mnecode},'%') </if>
<if test="outflag != null and outflag != ''"> and OUTFLAG like concat('%',#{outflag},'%') </if>
<if test="pkBalancesubj != null and pkBalancesubj != ''"> and PK_BALANCESUBJ like concat('%',#{pkBalancesubj},'%') </if>
<if test="pkCashflow != null and pkCashflow != ''"> and PK_CASHFLOW like concat('%',#{pkCashflow},'%') </if>
<if test="pkCorp != null and pkCorp != ''"> and PK_CORP like concat('%',#{pkCorp},'%') </if>
<if test="pkCostsubj != null and pkCostsubj != ''"> and PK_COSTSUBJ like concat('%',#{pkCostsubj},'%') </if>
<if test="pkParent != null and pkParent != ''"> and PK_PARENT like concat('%',#{pkParent},'%') </if>
<if test="pkSource != null and pkSource != ''"> and PK_SOURCE like concat('%',#{pkSource},'%') </if>
<if test="sealflag != null and sealflag != ''"> and SEALFLAG like concat('%',#{sealflag},'%') </if>
<if test="ts != null and ts != ''"> and TS like concat('%',#{ts},'%') </if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
<!-- 查询列表 字段采用or格式 -->
<select id="BdCostsubjentity_list_or" resultMap="get-BdCostsubjEntity-result" parameterType = "com.hzya.frame.plugin.lets.entity.BdCostsubjEntity">
select
<include refid="BdCostsubjEntity_Base_Column_List" />
from BD_COSTSUBJ
<trim prefix="where" prefixOverrides="and">
<if test="costcode != null and costcode != ''"> or COSTCODE = #{costcode} </if>
<if test="costname != null and costname != ''"> or COSTNAME = #{costname} </if>
<if test="creatorcorp != null and creatorcorp != ''"> or CREATORCORP = #{creatorcorp} </if>
<if test="def1 != null and def1 != ''"> or DEF1 = #{def1} </if>
<if test="def2 != null and def2 != ''"> or DEF2 = #{def2} </if>
<if test="def3 != null and def3 != ''"> or DEF3 = #{def3} </if>
<if test="def4 != null and def4 != ''"> or DEF4 = #{def4} </if>
<if test="def5 != null and def5 != ''"> or DEF5 = #{def5} </if>
<if test="dr != null and dr != ''"> or DR = #{dr} </if>
<if test="free1 != null and free1 != ''"> or FREE1 = #{free1} </if>
<if test="free10 != null and free10 != ''"> or FREE10 = #{free10} </if>
<if test="free2 != null and free2 != ''"> or FREE2 = #{free2} </if>
<if test="free3 != null and free3 != ''"> or FREE3 = #{free3} </if>
<if test="free4 != null and free4 != ''"> or FREE4 = #{free4} </if>
<if test="free5 != null and free5 != ''"> or FREE5 = #{free5} </if>
<if test="free6 != null and free6 != ''"> or FREE6 = #{free6} </if>
<if test="free7 != null and free7 != ''"> or FREE7 = #{free7} </if>
<if test="free8 != null and free8 != ''"> or FREE8 = #{free8} </if>
<if test="free9 != null and free9 != ''"> or FREE9 = #{free9} </if>
<if test="incomeflag != null and incomeflag != ''"> or INCOMEFLAG = #{incomeflag} </if>
<if test="ioflag != null and ioflag != ''"> or IOFLAG = #{ioflag} </if>
<if test="isactiveappr != null and isactiveappr != ''"> or ISACTIVEAPPR = #{isactiveappr} </if>
<if test="isbalancesubj != null and isbalancesubj != ''"> or ISBALANCESUBJ = #{isbalancesubj} </if>
<if test="isexpensepro != null and isexpensepro != ''"> or ISEXPENSEPRO = #{isexpensepro} </if>
<if test="memo != null and memo != ''"> or MEMO = #{memo} </if>
<if test="mnecode != null and mnecode != ''"> or MNECODE = #{mnecode} </if>
<if test="outflag != null and outflag != ''"> or OUTFLAG = #{outflag} </if>
<if test="pkBalancesubj != null and pkBalancesubj != ''"> or PK_BALANCESUBJ = #{pkBalancesubj} </if>
<if test="pkCashflow != null and pkCashflow != ''"> or PK_CASHFLOW = #{pkCashflow} </if>
<if test="pkCorp != null and pkCorp != ''"> or PK_CORP = #{pkCorp} </if>
<if test="pkCostsubj != null and pkCostsubj != ''"> or PK_COSTSUBJ = #{pkCostsubj} </if>
<if test="pkParent != null and pkParent != ''"> or PK_PARENT = #{pkParent} </if>
<if test="pkSource != null and pkSource != ''"> or PK_SOURCE = #{pkSource} </if>
<if test="sealflag != null and sealflag != ''"> or SEALFLAG = #{sealflag} </if>
<if test="ts != null and ts != ''"> or TS = #{ts} </if>
and sts='Y'
</trim>
<if test=" sort == null or sort == ''.toString() "> order by sorts asc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select>
</mapper>

4
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseReturn.java
View File

@ -579,8 +579,8 @@ public class ProxyPurchaseReturn extends PluginBaseEntity {
Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size());
} }
//采购部门：其他 //采购部门：业务部门
String deptName = "其他部门"; String deptName = "业务部门";
BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity(); BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
bdDeptdocEntity.setDataSourceCode("lets_u8c"); bdDeptdocEntity.setDataSourceCode("lets_u8c");
bdDeptdocEntity.setDr(0); bdDeptdocEntity.setDr(0);

2
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/purchase/ProxyPurchaseWarehousWarehouse.java
View File

@ -589,7 +589,7 @@ public class ProxyPurchaseWarehousWarehouse extends PluginBaseEntity {
Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size()); Assert.state(false, "根据O货主编码{}，匹配到U8C销售公司{}个", companyCode, bdCorpEntityList.size());
} }
//采购部门：其他 //采购部门：业务部门
String deptName = "业务部门"; String deptName = "业务部门";
BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity(); BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
bdDeptdocEntity.setDataSourceCode("lets_u8c"); bdDeptdocEntity.setDataSourceCode("lets_u8c");

17
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToB.java
View File

@ -102,6 +102,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
private static final String PROD_FILED = "prod"; private static final String PROD_FILED = "prod";
@Autowired
private QueryU8CEntityUtil queryU8CEntityUtil;
@Override @Override
public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
long startMillis = System.currentTimeMillis(); long startMillis = System.currentTimeMillis();
@ -779,6 +782,10 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
isblargessflag = true; isblargessflag = true;
} }
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
SaleorderRequestChildrenDto saleorderRequestChildrenDto = new SaleorderRequestChildrenDto(); SaleorderRequestChildrenDto saleorderRequestChildrenDto = new SaleorderRequestChildrenDto();
saleorderRequestChildrenDto.setBlargessflag(isblargessflag);//是否赠品 saleorderRequestChildrenDto.setBlargessflag(isblargessflag);//是否赠品
saleorderRequestChildrenDto.setCadvisecalbodyid(bdCalbodyEntity.getPkCalbody());//发货库存组织 saleorderRequestChildrenDto.setCadvisecalbodyid(bdCalbodyEntity.getPkCalbody());//发货库存组织
@ -807,6 +814,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
//TODO 先不传，抛出长度异常，后续再改 //TODO 先不传，抛出长度异常，后续再改
// saleorderRequestChildrenDto.setVdef19(header.getCode());//原单单号 // saleorderRequestChildrenDto.setVdef19(header.getCode());//原单单号
saleorderRequestChildrenDto.setVdef20(detailsDto.getId());//原单明细主键 saleorderRequestChildrenDto.setVdef20(detailsDto.getId());//原单明细主键
saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto); saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto);
} }
//记录成功 //记录成功
@ -1022,7 +1032,7 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
//业务部门 //业务部门
//2024年8月14日 10:38:37 已经和佳妮确认 //2024年8月14日 10:38:37 已经和佳妮确认
String deptName = "其他部门"; String deptName = "业务部门";
BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity(); BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
bdDeptdocEntity.setDataSourceCode("lets_u8c"); bdDeptdocEntity.setDataSourceCode("lets_u8c");
bdDeptdocEntity.setDr(0); bdDeptdocEntity.setDr(0);
@ -1778,6 +1788,9 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
IcGeneralBEntity sourceDocuments = findSourceDocuments(header, detailsDto, soSaleorderBEntityList, icGeneralBEntityList, extIntegrationTaskLivingDetailsQueryVos); IcGeneralBEntity sourceDocuments = findSourceDocuments(header, detailsDto, soSaleorderBEntityList, icGeneralBEntityList, extIntegrationTaskLivingDetailsQueryVos);
//查找来源销售订单明细行 //查找来源销售订单明细行
SoSaleorderBEntity sourceDocumentsV2 = findSourceDocumentsV2(header, detailsDto, soSaleorderBEntityList, extIntegrationTaskLivingDetailsQueryVos); SoSaleorderBEntity sourceDocumentsV2 = findSourceDocumentsV2(header, detailsDto, soSaleorderBEntityList, extIntegrationTaskLivingDetailsQueryVos);
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
BigDecimal noriginalcurtaxprice = null;//含税单价 BigDecimal noriginalcurtaxprice = null;//含税单价
try { try {
@ -1817,6 +1830,8 @@ public class SoSaleOutPluginInitializerToB extends PluginBaseEntity {
// salesInvoiceBodyDto.setCsaleid("1009A2100000000004WK");//销售主表id // salesInvoiceBodyDto.setCsaleid("1009A2100000000004WK");//销售主表id
// salesInvoiceBodyDto.setCunitid("0001A210000000000EYM");//主计量单位 // salesInvoiceBodyDto.setCunitid("0001A210000000000EYM");//主计量单位
// salesInvoiceBodyDto.setCupsourcebillbodyid("1009A2100000000004R3");//上层来源单据行 // salesInvoiceBodyDto.setCupsourcebillbodyid("1009A2100000000004R3");//上层来源单据行
salesInvoiceBodyDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
salesInvoiceBodyDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
salesInvoiceBodyDtoList.add(salesInvoiceBodyDto); salesInvoiceBodyDtoList.add(salesInvoiceBodyDto);
} }

16
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java
View File

@ -98,6 +98,9 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
private static final String TRAN = "tran"; private static final String TRAN = "tran";
@Autowired
private QueryU8CEntityUtil queryU8CEntityUtil;
@Override @Override
public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception {
long startMillis = System.currentTimeMillis(); long startMillis = System.currentTimeMillis();
@ -812,6 +815,10 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
// BdTaxitemsEntity bdTaxitemsEntity1 = queryBdTaxitems(bdInvbasdocEntity.getInvcode()); // BdTaxitemsEntity bdTaxitemsEntity1 = queryBdTaxitems(bdInvbasdocEntity.getInvcode());
BdTaxitemsEntity bdTaxitemsEntity1 = sonDetailsDto.getBdTaxitemsEntity(); BdTaxitemsEntity bdTaxitemsEntity1 = sonDetailsDto.getBdTaxitemsEntity();
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString(); String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString();
BigDecimal noriginalcurprice = null;//无税单价 BigDecimal noriginalcurprice = null;//无税单价
BigDecimal noriginalcurmny = null;//无税金额 BigDecimal noriginalcurmny = null;//无税金额
@ -861,6 +868,8 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率 saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率
// saleorderRequestChildrenDto.setCreccalbodyid(bdCalbodyEntity1.getPkCalbody());//收货库存组织：2024年8月7日 16:21:48 和佳妮、道品一起测试，收货库存组织、收货仓库 是不需要传递的 // saleorderRequestChildrenDto.setCreccalbodyid(bdCalbodyEntity1.getPkCalbody());//收货库存组织：2024年8月7日 16:21:48 和佳妮、道品一起测试，收货库存组织、收货仓库 是不需要传递的
// saleorderRequestChildrenDto.setCrecwareid(bdStordocEntity1.getPkStordoc());//收货仓库 // saleorderRequestChildrenDto.setCrecwareid(bdStordocEntity1.getPkStordoc());//收货仓库
saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto); saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto);
//销售订单单据推送到u8c //销售订单单据推送到u8c
@ -1575,6 +1584,10 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>(); List<SaleorderRequestChildrenDto> saleorderRequestChildrenDtoList = new ArrayList<>();
saleorderRequestDto.setChildrenvo(saleorderRequestChildrenDtoList); saleorderRequestDto.setChildrenvo(saleorderRequestChildrenDtoList);
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString(); String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString();
BigDecimal noriginalcurprice = null;//无税单价 BigDecimal noriginalcurprice = null;//无税单价
BigDecimal noriginalcurmny = null;//无税金额 BigDecimal noriginalcurmny = null;//无税金额
@ -1623,6 +1636,9 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率 saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率
// saleorderRequestChildrenDto.setCreccalbodyid(bdCalbodyEntity1.getPkCalbody());//收货库存组织：2024年8月7日 16:21:48 和佳妮、道品一起测试，收货库存组织、收货仓库 是不需要传递的 // saleorderRequestChildrenDto.setCreccalbodyid(bdCalbodyEntity1.getPkCalbody());//收货库存组织：2024年8月7日 16:21:48 和佳妮、道品一起测试，收货库存组织、收货仓库 是不需要传递的
// saleorderRequestChildrenDto.setCrecwareid(bdStordocEntity1.getPkStordoc());//收货仓库 // saleorderRequestChildrenDto.setCrecwareid(bdStordocEntity1.getPkStordoc());//收货仓库
saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto); saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto);
//销售订单单据推送到u8c //销售订单单据推送到u8c

18
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToB.java
View File

@ -64,6 +64,9 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
@Autowired @Autowired
private IBdInvbasdocDao iBdInvbasdocDao; private IBdInvbasdocDao iBdInvbasdocDao;
@Autowired
private QueryU8CEntityUtil queryU8CEntityUtil;
@Override @Override
public void initialize() { public void initialize() {
logger.info(getPluginLabel() + "執行初始化方法initialize()"); logger.info(getPluginLabel() + "執行初始化方法initialize()");
@ -748,6 +751,10 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString(); String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString();
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
// 如果是海外的店铺，则税率为零 // 如果是海外的店铺，则税率为零
String exportVaue = ExportConstant.exportConstant.get(header.getStoreCode()); String exportVaue = ExportConstant.exportConstant.get(header.getStoreCode());
if (exportVaue != null) { if (exportVaue != null) {
@ -802,6 +809,8 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价 saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价
saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率 saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率
saleorderRequestChildrenDto.setVdef20(stockinB.getId());//原单明细主键 saleorderRequestChildrenDto.setVdef20(stockinB.getId());//原单明细主键
saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto); saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto);
} }
//记录成功 //记录成功
@ -979,7 +988,7 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
//业务部门 //业务部门
//2024年8月14日 10:38:37 已经和佳妮确认 //2024年8月14日 10:38:37 已经和佳妮确认
String deptName = "其他部门"; String deptName = "业务部门";
BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity(); BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
bdDeptdocEntity.setDataSourceCode("lets_u8c"); bdDeptdocEntity.setDataSourceCode("lets_u8c");
bdDeptdocEntity.setDr(0); bdDeptdocEntity.setDr(0);
@ -1733,6 +1742,9 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
IcGeneralBEntity sourceDocuments = findSourceDocuments(header, stockinB, soSaleorderBEntityList, icGeneralBEntityList, extIntegrationTaskLivingDetailsQueryVos); IcGeneralBEntity sourceDocuments = findSourceDocuments(header, stockinB, soSaleorderBEntityList, icGeneralBEntityList, extIntegrationTaskLivingDetailsQueryVos);
//查找来源销售订单明细行 //查找来源销售订单明细行
SoSaleorderBEntity sourceDocumentsV2 = findSourceDocumentsV2(header, stockinB, soSaleorderBEntityList, extIntegrationTaskLivingDetailsQueryVos); SoSaleorderBEntity sourceDocumentsV2 = findSourceDocumentsV2(header, stockinB, soSaleorderBEntityList, extIntegrationTaskLivingDetailsQueryVos);
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
BigDecimal noriginalcurtaxprice = null;//含税单价 BigDecimal noriginalcurtaxprice = null;//含税单价
try { try {
@ -1761,12 +1773,14 @@ public class SoSaleReturnPluginInitializerToB extends PluginBaseEntity {
salesInvoiceBodyDto.setCupsourcebillbodyid(sourceDocuments.getCgeneralbid());//上层来源明细行主键 salesInvoiceBodyDto.setCupsourcebillbodyid(sourceDocuments.getCgeneralbid());//上层来源明细行主键
salesInvoiceBodyDto.setCupsourcebillcode(icGeneralHEntity.getVbillcode());//直接来源单据号 salesInvoiceBodyDto.setCupsourcebillcode(icGeneralHEntity.getVbillcode());//直接来源单据号
salesInvoiceBodyDto.setCupsourcebillid(icGeneralHEntity.getCgeneralhid());//来源主表主键 salesInvoiceBodyDto.setCupsourcebillid(icGeneralHEntity.getCgeneralhid());//来源主表主键
salesInvoiceBodyDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
salesInvoiceBodyDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
salesInvoiceBodyDtoList.add(salesInvoiceBodyDto); salesInvoiceBodyDtoList.add(salesInvoiceBodyDto);
} }
SalesInvoiceDto salesInvoiceDto = new SalesInvoiceDto(); SalesInvoiceDto salesInvoiceDto = new SalesInvoiceDto();
salesInvoiceDto.setParentvo(salesInvoiceHeadDto); salesInvoiceDto.setParentvo(salesInvoiceHeadDto);
salesInvoiceDto.setChildrenvo(salesInvoiceBodyDtoList); salesInvoiceDto.setChildrenvo(salesInvoiceBodyDtoList);
List<SalesInvoiceDto> salesInvoiceDtoList = new ArrayList<>(); List<SalesInvoiceDto> salesInvoiceDtoList = new ArrayList<>();
salesInvoiceDtoList.add(salesInvoiceDto); salesInvoiceDtoList.add(salesInvoiceDto);

13
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
View File

@ -64,6 +64,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
private static final String PROD_FILED = "prod"; private static final String PROD_FILED = "prod";
@Autowired
private QueryU8CEntityUtil queryU8CEntityUtil;
@Override @Override
public void initialize() { public void initialize() {
logger.info(getPluginLabel() + "執行初始化方法initialize()"); logger.info(getPluginLabel() + "執行初始化方法initialize()");
@ -656,6 +659,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
BdInvbasdocEntity bdInvbasdocEntity = oldValue.get(0).getBdInvbasdocEntity(); BdInvbasdocEntity bdInvbasdocEntity = oldValue.get(0).getBdInvbasdocEntity();
//根据存货基础档案编码，查询当前存货的税率 //根据存货基础档案编码，查询当前存货的税率
BdTaxitemsEntity bdTaxitemsEntity1 = oldValue.get(0).getBdTaxitemsEntity(); BdTaxitemsEntity bdTaxitemsEntity1 = oldValue.get(0).getBdTaxitemsEntity();
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString(); String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString();
BigDecimal noriginalcurprice = null;//无税单价 BigDecimal noriginalcurprice = null;//无税单价
@ -702,6 +708,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
saleorderRequestChildrenDto.setNoriginalcurtaxnetprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税净价 saleorderRequestChildrenDto.setNoriginalcurtaxnetprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税净价
saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价 saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价
saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率 saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率
saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto); saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto);
//销售订单单据推送到u8c //销售订单单据推送到u8c
@ -833,6 +841,9 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
BdInvbasdocEntity bdInvbasdocEntity = oldValue.get(0).getBdInvbasdocEntity(); BdInvbasdocEntity bdInvbasdocEntity = oldValue.get(0).getBdInvbasdocEntity();
//根据存货基础档案编码，查询当前存货的税率 //根据存货基础档案编码，查询当前存货的税率
BdTaxitemsEntity bdTaxitemsEntity1 = oldValue.get(0).getBdTaxitemsEntity(); BdTaxitemsEntity bdTaxitemsEntity1 = oldValue.get(0).getBdTaxitemsEntity();
//查询收支项目
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntity);
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString(); String tax = "0." + new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString();
BigDecimal noriginalcurprice = null;//无税单价 BigDecimal noriginalcurprice = null;//无税单价
@ -879,6 +890,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
saleorderRequestChildrenDto.setNoriginalcurtaxnetprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税净价 saleorderRequestChildrenDto.setNoriginalcurtaxnetprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税净价
saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价 saleorderRequestChildrenDto.setNoriginalcurtaxprice(noriginalcurtaxprice.stripTrailingZeros().toPlainString());//含税单价
saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率 saleorderRequestChildrenDto.setNtaxrate(new BigDecimal(bdTaxitemsEntity1.getTaxratio()).stripTrailingZeros().toPlainString());//税率
saleorderRequestChildrenDto.setVdef2(bdCostsubjEntity.getCostname());//收支项目
saleorderRequestChildrenDto.setPk_defdoc2(bdCostsubjEntity.getPkCostsubj());
saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto); saleorderRequestChildrenDtoList.add(saleorderRequestChildrenDto);
//销售订单单据推送到u8c //销售订单单据推送到u8c

2
buildpackage/src/main/java/com/hzya/frame/plugin/lets/u8cdto/SalesInvoiceBodyDto.java
View File

@ -49,4 +49,6 @@ public class SalesInvoiceBodyDto {
private String creceipttype; private String creceipttype;
private String csaleid; private String csaleid;
private String cunitid; private String cunitid;
private String vdef2;
private String pk_defdoc2;
} }

100
buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtil.java
View File

@ -1,14 +1,10 @@
package com.hzya.frame.plugin.lets.util; package com.hzya.frame.plugin.lets.util;
import cn.hutool.core.lang.Assert;
import com.hzya.frame.plugin.lets.constant.OverallConstant;
import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant; import com.hzya.frame.plugin.lets.constant.ProfilesActiveConstant;
import com.hzya.frame.plugin.lets.dao.IBdCorpDao; import com.hzya.frame.plugin.lets.dao.*;
import com.hzya.frame.plugin.lets.dao.IBdInvbasdocDao; import com.hzya.frame.plugin.lets.entity.*;
import com.hzya.frame.plugin.lets.dao.IBdInvmandocDao;
import com.hzya.frame.plugin.lets.dao.IBdStordocDao;
import com.hzya.frame.plugin.lets.entity.BdCorpEntity;
import com.hzya.frame.plugin.lets.entity.BdInvbasdocEntity;
import com.hzya.frame.plugin.lets.entity.BdInvmandocEntity;
import com.hzya.frame.plugin.lets.entity.BdStordocEntity;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -74,10 +70,11 @@ public class QueryU8CEntityUtil {
/** /**
* 根据仓库编码查询仓库 * 根据仓库编码查询仓库
*
* @param storCode * @param storCode
* @return * @return
*/ */
public BdStordocEntity queryBdStordocByCode(String storCode){ public BdStordocEntity queryBdStordocByCode(String storCode) {
BdStordocEntity entity = new BdStordocEntity(); BdStordocEntity entity = new BdStordocEntity();
entity.setDr(0L); entity.setDr(0L);
entity.setStorcode(storCode); entity.setStorcode(storCode);
@ -89,12 +86,14 @@ public class QueryU8CEntityUtil {
return null; return null;
} }
} }
/** /**
* 根据仓库主键查询仓库 * 根据仓库主键查询仓库
*
* @param pkStordoc * @param pkStordoc
* @return * @return
*/ */
public BdStordocEntity queryBdStordocByPk(String pkStordoc){ public BdStordocEntity queryBdStordocByPk(String pkStordoc) {
BdStordocEntity entity = new BdStordocEntity(); BdStordocEntity entity = new BdStordocEntity();
entity.setDr(0L); entity.setDr(0L);
entity.setPkStordoc(pkStordoc); entity.setPkStordoc(pkStordoc);
@ -106,12 +105,14 @@ public class QueryU8CEntityUtil {
return null; return null;
} }
} }
/** /**
* 根据仓库名称查询仓库 * 根据仓库名称查询仓库
*
* @param StorName * @param StorName
* @return * @return
*/ */
public BdStordocEntity queryBdStordocByNamek(String StorName){ public BdStordocEntity queryBdStordocByNamek(String StorName) {
BdStordocEntity entity = new BdStordocEntity(); BdStordocEntity entity = new BdStordocEntity();
entity.setDr(0L); entity.setDr(0L);
entity.setStorname(StorName); entity.setStorname(StorName);
@ -123,13 +124,15 @@ public class QueryU8CEntityUtil {
return null; return null;
} }
} }
/** /**
* 根据仓库编码+公司编码查询仓库 * 根据仓库编码+公司编码查询仓库
*
* @param storCode * @param storCode
* @param pkCorp * @param pkCorp
* @return * @return
*/ */
public BdStordocEntity queryBdStordocByCodeAndPkCorp(String storCode,String pkCorp){ public BdStordocEntity queryBdStordocByCodeAndPkCorp(String storCode, String pkCorp) {
BdStordocEntity entity = new BdStordocEntity(); BdStordocEntity entity = new BdStordocEntity();
entity.setDr(0L); entity.setDr(0L);
entity.setStorcode(storCode); entity.setStorcode(storCode);
@ -204,4 +207,77 @@ public class QueryU8CEntityUtil {
////////////////////////////////////////////////////////////////////////////////////////存货管理档案 ////////////////////////////////////////////////////////////////////////////////////////存货管理档案
////////////////////////////////////////////////////////////////////////////////////////存货分类开始
@Autowired
private IBdInvclDao iBdInvclDao;
/**
* 根据存货，查询对应的存货分类
*
* @author liuyang
*/
public BdInvclEntity queryBdInvbasdocByBdInvcl(BdInvbasdocEntity bdInvbasdocEntity) throws Exception {
Assert.notNull(bdInvbasdocEntity, "bdInvbasdocEntity不能为空");
String pkInvcl = bdInvbasdocEntity.getPkInvcl();
Assert.notNull(pkInvcl, "存货:{}，对应的存货分类主键不能为空!", bdInvbasdocEntity.getInvcode());
Assert.state(!"".equals(pkInvcl), "存货:{}，对应的存货分类主键不能为空!", bdInvbasdocEntity.getInvcode());
BdInvclEntity bdInvclEntity = new BdInvclEntity();
bdInvclEntity.setPkInvcl(pkInvcl);
bdInvclEntity.setDr(0);
bdInvclEntity.setDataSourceCode("lets_u8c");
List<BdInvclEntity> bdInvclEntityList = iBdInvclDao.query(bdInvclEntity);
if (bdInvclEntityList == null || bdInvclEntityList.size() == 0) {
Assert.state(false, "根据存货分类主键，无法查询到对应的U8C存货分类档案！主键：{}", pkInvcl);
}
return bdInvclEntityList.get(0);
}
////////////////////////////////////////////////////////////////////////////////////////存货分类结束
////////////////////////////////////////////////////////////////////////////////////////存货分类-收支项目开始
@Autowired
private IBdDefdocDao iBdDefdocDao;
@Autowired
private IBdCostsubjDao iBdCostsubjDao;
/**
* 根据，存货分类，查询对应的收支项目
*
* @author liuyang
*/
public BdCostsubjEntity queryBdCostsubj(BdInvclEntity bdInvclEntity) {
Assert.notNull(bdInvclEntity, "bdInvclEntity不能为空!");
String platformZdyId2 = OverallConstant.getOverAllValue("u8c自定义项档案-存货分类对应收支项目主键");
BdDefdocEntity bdDefdocEntity = new BdDefdocEntity();
bdDefdocEntity.setDoccode(bdInvclEntity.getInvclasscode());
bdDefdocEntity.setPkDefdoclist(platformZdyId2);
bdDefdocEntity.setDr(0);
bdDefdocEntity.setDataSourceCode("lets_u8c");
List<BdDefdocEntity> bdDefdocEntityList = iBdDefdocDao.query(bdDefdocEntity);
if (bdDefdocEntityList == null || bdDefdocEntityList.size() == 0) {
Assert.state(false, "在「存货分类对应收支项目」档案中无法匹配到自定义档案！存货分类编码：{} 自定义项档案编码：{}", bdInvclEntity.getInvclasscode(), platformZdyId2);
} else if (bdDefdocEntityList.size() >= 2) {
Assert.state(false, "在「存货分类对应收支项目」档案中匹配到{}个自定义档案！存在歧义！ 存货分类编码：{} 自定义项档案编码：{}", bdDefdocEntityList.size(), bdInvclEntity.getInvclasscode(), platformZdyId2);
}
BdDefdocEntity bdDefdocEntity1 = bdDefdocEntityList.get(0);
String memo = bdDefdocEntity1.getMemo();
Assert.notNull(memo, "在档案：「存货分类对应收支项目」，档案编码：{} 档案名称：{}，对应的备注字段（记录收支项目编码）不能为空！", bdDefdocEntity1.getDoccode(), bdDefdocEntity1.getDocname());
Assert.state(!"".equals(memo), "在档案：「存货分类对应收支项目」，档案编码：{} 档案名称：{}，对应的备注字段（记录收支项目编码）不能为空！", bdDefdocEntity1.getDoccode(), bdDefdocEntity1.getDocname());
//查询对应的收知项目档案
BdCostsubjEntity bdCostsubjEntity = new BdCostsubjEntity();
bdCostsubjEntity.setDr("0");
bdCostsubjEntity.setCostcode(memo);
bdCostsubjEntity.setDataSourceCode("lets_u8c");
List<BdCostsubjEntity> bdCostsubjEntityList = iBdCostsubjDao.query(bdCostsubjEntity);
if (bdCostsubjEntityList == null || bdCostsubjEntityList.size() == 0) {
Assert.state(false, "无法匹配到U8C收支项目 编码:{}", memo);
}
return bdCostsubjEntityList.get(0);
}
////////////////////////////////////////////////////////////////////////////////////////存货分类-收支项目结束
} }

2
buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocOrderBasicArchivesCacheUtil.java
View File

@ -167,7 +167,7 @@ public class TocOrderBasicArchivesCacheUtil {
BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity(); BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
bdDeptdocEntity.setDataSourceCode("lets_u8c"); bdDeptdocEntity.setDataSourceCode("lets_u8c");
bdDeptdocEntity.setDr(0); bdDeptdocEntity.setDr(0);
bdDeptdocEntity.setDeptname("其他部门"); bdDeptdocEntity.setDeptname("业务部门");
List<BdDeptdocEntity> bdDeptdocEntityList = iBdDeptdocDao.query(bdDeptdocEntity); List<BdDeptdocEntity> bdDeptdocEntityList = iBdDeptdocDao.query(bdDeptdocEntity);
if (bdDeptdocEntityList != null && bdDeptdocEntityList.size() > 0) { if (bdDeptdocEntityList != null && bdDeptdocEntityList.size() > 0) {
for (int i = 0; i < bdDeptdocEntityList.size(); i++) { for (int i = 0; i < bdDeptdocEntityList.size(); i++) {

2
buildpackage/src/main/java/com/hzya/frame/plugin/lets/util/TocReturnBasicArchivesCacheUtil.java
View File

@ -160,7 +160,7 @@ public class TocReturnBasicArchivesCacheUtil {
BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity(); BdDeptdocEntity bdDeptdocEntity = new BdDeptdocEntity();
bdDeptdocEntity.setDataSourceCode("lets_u8c"); bdDeptdocEntity.setDataSourceCode("lets_u8c");
bdDeptdocEntity.setDr(0); bdDeptdocEntity.setDr(0);
bdDeptdocEntity.setDeptname("其他部门"); bdDeptdocEntity.setDeptname("业务部门");
List<BdDeptdocEntity> bdDeptdocEntityList = iBdDeptdocDao.query(bdDeptdocEntity); List<BdDeptdocEntity> bdDeptdocEntityList = iBdDeptdocDao.query(bdDeptdocEntity);
if (bdDeptdocEntityList != null && bdDeptdocEntityList.size() > 0) { if (bdDeptdocEntityList != null && bdDeptdocEntityList.size() > 0) {
for (int i = 0; i < bdDeptdocEntityList.size(); i++) { for (int i = 0; i < bdDeptdocEntityList.size(); i++) {

2
buildpackage/src/main/resources/cfgHome/plugin/lets/spring/spring-lets-dao.xml
View File

@ -59,4 +59,6 @@
<bean name="scOrderBDao" class="com.hzya.frame.plugin.lets.dao.impl.ScOrderBDaoImpl"/> <bean name="scOrderBDao" class="com.hzya.frame.plugin.lets.dao.impl.ScOrderBDaoImpl"/>
<bean name="scOrderDao" class="com.hzya.frame.plugin.lets.dao.impl.ScOrderDaoImpl"/> <bean name="scOrderDao" class="com.hzya.frame.plugin.lets.dao.impl.ScOrderDaoImpl"/>
<bean name="bdSetpartDao" class="com.hzya.frame.plugin.lets.dao.impl.BdSetpartDaoImpl"/> <bean name="bdSetpartDao" class="com.hzya.frame.plugin.lets.dao.impl.BdSetpartDaoImpl"/>
<bean name="bdCostsubjDaoImpl" class="com.hzya.frame.plugin.lets.dao.impl.BdCostsubjDaoImpl"/>
</beans> </beans>

62
buildpackage/src/test/java/com/hzya/frame/plugin/lets/util/QueryU8CEntityUtilTest.java Normal file
View File

@ -0,0 +1,62 @@
package com.hzya.frame.plugin.lets.util;
import com.alibaba.fastjson2.JSON;
import com.hzya.frame.WebappApplication;
import com.hzya.frame.plugin.lets.dao.IBdInvbasdocDao;
import com.hzya.frame.plugin.lets.dao.IBdInvclDao;
import com.hzya.frame.plugin.lets.entity.BdCostsubjEntity;
import com.hzya.frame.plugin.lets.entity.BdInvbasdocEntity;
import com.hzya.frame.plugin.lets.entity.BdInvclEntity;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import java.util.List;
import static org.junit.Assert.*;
/**
* @Author：liuyang
* @Package：com.hzya.frame.plugin.lets.util
* @Project：kangarooDataCenterV3
* @name：QueryU8CEntityUtilTest
* @Date：2024/9/20 13:43
* @Filename：QueryU8CEntityUtilTest
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = WebappApplication.class)
public class QueryU8CEntityUtilTest {
@Autowired
private QueryU8CEntityUtil queryU8CEntityUtil;
@Autowired
private IBdInvclDao iBdInvclDao;
@Autowired
private IBdInvbasdocDao iBdInvbasdocDao;
@Test
public void queryBdInvbasdocByBdInvcl() throws Exception {
// BdInvclEntity bdInvclEntity = new BdInvclEntity();
// bdInvclEntity.setInvclasscode("DL002");
// bdInvclEntity.setDr(0);
// bdInvclEntity.setDataSourceCode("lets_u8c");
// List<BdInvclEntity> query = iBdInvclDao.query(bdInvclEntity);
//存货基本档案
// String s = "6973391730792";
BdInvbasdocEntity bdInvbasdocEntity = new BdInvbasdocEntity();
bdInvbasdocEntity.setInvcodes("'6973391730792'");
List<BdInvbasdocEntity> bdInvbasdocEntities = iBdInvbasdocDao.queryBdInvbasdocByPkInvmandocV3(bdInvbasdocEntity);
BdInvclEntity bdInvclEntity = queryU8CEntityUtil.queryBdInvbasdocByBdInvcl(bdInvbasdocEntities.get(0));
BdCostsubjEntity bdCostsubjEntity = queryU8CEntityUtil.queryBdCostsubj(bdInvclEntity);
System.out.println(JSON.toJSONString(bdCostsubjEntity));
}
// @Test
// public void queryBdCostsubj() {
// }
}