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

包路径修改

This commit is contained in:
xiang2lin 2025-03-19 15:40:24 +08:00
parent 5c29383ae0
commit 43a67e9721
4 changed files with 70 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fw-u8/src/main/java/com/hzya/frame/u8/base/identity/entity/UAIdentityEntity.xml
View File

@ -23,7 +23,7 @@
from UFSystem.UA_Identity where id = #{ id } from UFSystem.UA_Identity where id = #{ id }
</select> </select>
<!-- 销售订单主键id 发布的时候002账套要改成002账套--> <!-- 单据编号生成控制表 -->
<select id="UAIdentityEntity_list_base_cvouchtype" resultMap="get-UAIdentityEntity-result" parameterType="com.hzya.frame.u8.base.identity.entity.UAIdentityEntity"> <select id="UAIdentityEntity_list_base_cvouchtype" resultMap="get-UAIdentityEntity-result" parameterType="com.hzya.frame.u8.base.identity.entity.UAIdentityEntity">
select select
<include refid="UAIdentityEntity_Base_Column_List" /> <include refid="UAIdentityEntity_Base_Column_List" />
@ -50,6 +50,7 @@
<if test="cVouchType != null and cVouchType !='' ">cVouchType = #{cVouchType} </if> <if test="cVouchType != null and cVouchType !='' ">cVouchType = #{cVouchType} </if>
<if test="iFatherId != null "> and iFatherId = #{iFatherId}</if> <if test="iFatherId != null "> and iFatherId = #{iFatherId}</if>
<if test="iChildId != null "> and iChildId = #{iChildId}</if> <if test="iChildId != null "> and iChildId = #{iChildId}</if>
<if test="cacc_id != null and cacc_id != '' "> and cacc_id = #{cacc_id}</if>
</trim> </trim>
<if test=" sort =='' "> order by id desc</if> <if test=" sort =='' "> order by id desc</if>

8
fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/BasPartEntity.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.u8cinterface.entity.BasPartEntity"> <mapper namespace="com.hzya.frame.u8.base.inventory.entity.BasPartEntity">
<resultMap id="get-BasPartEntity-result" type="com.hzya.frame.u8cinterface.entity.BasPartEntity"> <resultMap id="get-BasPartEntity-result" type="com.hzya.frame.u8.base.inventory.entity.BasPartEntity">
<!--无备注 --> <!--无备注 -->
<result property="partId" column="partId" /> <result property="partId" column="partId" />
<result property="invCode" column="invCode" /> <result property="invCode" column="invCode" />
@ -13,7 +13,7 @@
</sql> </sql>
<!-- 查询 采用==查询 --> <!-- 查询 采用==查询 -->
<select id="BasPartEntity_list_base" resultMap="get-BasPartEntity-result" parameterType="com.hzya.frame.u8cinterface.entity.BasPartEntity"> <select id="BasPartEntity_list_base" resultMap="get-BasPartEntity-result" parameterType="com.hzya.frame.u8.base.inventory.entity.BasPartEntity">
select select
<include refid="BasPartEntity_Base_Column_List" /> <include refid="BasPartEntity_Base_Column_List" />
from ${acc_name}bas_part from ${acc_name}bas_part
@ -23,7 +23,7 @@
</trim> </trim>
</select> </select>
<insert id="BasPartEntity_insert" parameterType="com.hzya.frame.u8cinterface.entity.BasPartEntity" > <insert id="BasPartEntity_insert" parameterType="com.hzya.frame.u8.base.inventory.entity.BasPartEntity" >
insert into ${acc_name}bas_part (PartId,InvCode )values (#{partId},#{invCode}) insert into ${acc_name}bas_part (PartId,InvCode )values (#{partId},#{invCode})
</insert> </insert>

316
fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/entity/InventoryEntity.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hzya.frame.base.inventory.entity.InventoryEntity"> <mapper namespace="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
<resultMap id="get-InventoryEntity-result" type="com.hzya.frame.base.inventory.entity.InventoryEntity"> <resultMap id="get-InventoryEntity-result" type="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
<!--无备注 --> <!--无备注 -->
<result property="cInvCode" column="cInvCode" /> <result property="cInvCode" column="cInvCode" />
<!--无备注 --> <!--无备注 -->
@ -783,7 +783,7 @@
</select> </select>
<!-- 查询 采用==查询 --> <!-- 查询 采用==查询 -->
<select id="InventoryEntity_list_base" resultMap="get-InventoryEntity-result" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity"> <select id="InventoryEntity_list_base" resultMap="get-InventoryEntity-result" parameterType="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
select select
<include refid="InventoryEntity_Base_Column_List" /> <include refid="InventoryEntity_Base_Column_List" />
from Inventory from Inventory
@ -1044,14 +1044,11 @@
<if test="bCheckBatch != null and bCheckBatch !='' "> and bCheckBatch = #{bCheckBatch}</if> <if test="bCheckBatch != null and bCheckBatch !='' "> and bCheckBatch = #{bCheckBatch}</if>
<if test="bMngOldpart != null and bMngOldpart !='' "> and bMngOldpart = #{bMngOldpart}</if> <if test="bMngOldpart != null and bMngOldpart !='' "> and bMngOldpart = #{bMngOldpart}</if>
<if test="iOldpartMngRule != null and iOldpartMngRule !='' "> and iOldpartMngRule = #{iOldpartMngRule}</if> <if test="iOldpartMngRule != null and iOldpartMngRule !='' "> and iOldpartMngRule = #{iOldpartMngRule}</if>
and sts='Y'
</trim> </trim>
<if test=" sort =='' "> order by id desc</if>
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select> </select>
<!-- 查询符合条件的数量 --> <!-- 查询符合条件的数量 -->
<select id="InventoryEntity_count" resultType="Integer" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity"> <select id="InventoryEntity_count" resultType="Integer" parameterType="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
select count(1) from Inventory select count(1) from Inventory
<trim prefix="where" prefixOverrides="and"> <trim prefix="where" prefixOverrides="and">
<if test="cInvCode != null and cInvCode !='' ">cInvCode = #{cInvCode} </if> <if test="cInvCode != null and cInvCode !='' ">cInvCode = #{cInvCode} </if>
@ -1317,7 +1314,7 @@
</select> </select>
<!-- 分页查询列表 采用like格式 --> <!-- 分页查询列表 采用like格式 -->
<select id="InventoryEntity_list_like" resultMap="get-InventoryEntity-result" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity"> <select id="InventoryEntity_list_like" resultMap="get-InventoryEntity-result" parameterType="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
select select
<include refid="InventoryEntity_Base_Column_List" /> <include refid="InventoryEntity_Base_Column_List" />
from Inventory from Inventory
@ -1585,7 +1582,7 @@
</select> </select>
<!-- 查询列表 字段采用or格式 --> <!-- 查询列表 字段采用or格式 -->
<select id="InventoryEntity_list_or" resultMap="get-InventoryEntity-result" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity"> <select id="InventoryEntity_list_or" resultMap="get-InventoryEntity-result" parameterType="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
select select
<include refid="InventoryEntity_Base_Column_List" /> <include refid="InventoryEntity_Base_Column_List" />
from Inventory from Inventory
@ -1852,7 +1849,7 @@
<if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if> <if test=" sort !='' and sort!=null and order !='' and order!=null ">order by ${sort} ${order}</if>
</select> </select>
<!-- 新增 --> <!-- 新增 -->
<insert id="InventoryEntity_insert" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity"> <insert id="InventoryEntity_insert" parameterType="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
insert into Inventory( insert into Inventory(
<trim suffix="" suffixOverrides=","> <trim suffix="" suffixOverrides=",">
<if test="cInvCode != null and cInvCode !='' "> cInvCode, </if> <if test="cInvCode != null and cInvCode !='' "> cInvCode, </if>
@ -2110,10 +2107,7 @@
<if test="iAllocatePrintDgt != null ">iAllocatePrintDgt,</if> <if test="iAllocatePrintDgt != null ">iAllocatePrintDgt,</if>
<if test="bCheckBatch != null and bCheckBatch !='' "> bCheckBatch, </if> <if test="bCheckBatch != null and bCheckBatch !='' "> bCheckBatch, </if>
<if test="bMngOldpart != null and bMngOldpart !='' "> bMngOldpart, </if> <if test="bMngOldpart != null and bMngOldpart !='' "> bMngOldpart, </if>
<if test="iOldpartMngRule != null and iOldpartMngRule !='' "> iOldpartMngRule, </if> <if test="iOldpartMngRule != null and iOldpartMngRule !='' "> iOldpartMngRule</if>
create_time,
modify_time,
sts
</trim> </trim>
)values )values
( (
@ -2373,21 +2367,14 @@
<if test="iAllocatePrintDgt != null ">#{iAllocatePrintDgt},</if> <if test="iAllocatePrintDgt != null ">#{iAllocatePrintDgt},</if>
<if test="bCheckBatch != null and bCheckBatch !='' "> #{bCheckBatch}, </if> <if test="bCheckBatch != null and bCheckBatch !='' "> #{bCheckBatch}, </if>
<if test="bMngOldpart != null and bMngOldpart !='' "> #{bMngOldpart}, </if> <if test="bMngOldpart != null and bMngOldpart !='' "> #{bMngOldpart}, </if>
<if test="iOldpartMngRule != null and iOldpartMngRule !='' "> #{iOldpartMngRule}, </if> <if test="iOldpartMngRule != null and iOldpartMngRule !='' "> #{iOldpartMngRule}</if>
<if test="create_time != null "> #{create_time} ,</if>
<if test="create_time == null "> now(),</if>
<if test="modify_time != null "> #{modify_time},</if>
<if test="modify_time == null "> now(),</if>
'Y'
</trim> </trim>
) )
<selectKey keyProperty="id" resultType="String" order="BEFORE">
SELECT REPLACE(UUID(),'-','') as id
</selectKey>
</insert> </insert>
<!-- 修改 --> <!-- 修改 -->
<update id="InventoryEntity_update" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity"> <update id="InventoryEntity_update" parameterType="com.hzya.frame.u8.base.inventory.entity.InventoryEntity">
update Inventory set update Inventory set
<trim suffix="" suffixOverrides=","> <trim suffix="" suffixOverrides=",">
<if test="cInvCode != null and cInvCode !='' "> cInvCode = #{cInvCode},</if> <if test="cInvCode != null and cInvCode !='' "> cInvCode = #{cInvCode},</if>
@ -2645,286 +2632,9 @@
<if test="iAllocatePrintDgt != null ">iAllocatePrintDgt = #{iAllocatePrintDgt},</if> <if test="iAllocatePrintDgt != null ">iAllocatePrintDgt = #{iAllocatePrintDgt},</if>
<if test="bCheckBatch != null and bCheckBatch !='' "> bCheckBatch = #{bCheckBatch},</if> <if test="bCheckBatch != null and bCheckBatch !='' "> bCheckBatch = #{bCheckBatch},</if>
<if test="bMngOldpart != null and bMngOldpart !='' "> bMngOldpart = #{bMngOldpart},</if> <if test="bMngOldpart != null and bMngOldpart !='' "> bMngOldpart = #{bMngOldpart},</if>
<if test="iOldpartMngRule != null and iOldpartMngRule !='' "> iOldpartMngRule = #{iOldpartMngRule},</if> <if test="iOldpartMngRule != null and iOldpartMngRule !='' "> iOldpartMngRule = #{iOldpartMngRule}</if>
<if test="modify_time != null "> modify_time =#{modify_time} </if>
<if test="modify_time == null "> modify_time = now()</if>
</trim> </trim>
where id = #{id} where cInvCode = #{cInvCode}
</update> </update>
<!-- 逻辑删除 -->
<update id="InventoryEntity_logicDelete" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity">
update Inventory set
sts='N',modify_time = now(),modify_user_id = #{modify_user_id} where
id = #{id}
</update>
<!-- 逻辑删除多条件 -->
<update id="InventoryEntity_logicDelete_Multi_Condition" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity">
update Inventory set
sts='N',modify_time = now(),modify_user_id = #{modify_user_id}
<trim prefix="where" prefixOverrides="and">
<if test="cInvCode != null and cInvCode !='' ">cInvCode = #{cInvCode} </if>
<if test="cInvAddCode != null and cInvAddCode !='' "> and cInvAddCode = #{cInvAddCode}</if>
<if test="cInvName != null and cInvName !='' "> and cInvName = #{cInvName}</if>
<if test="cInvStd != null and cInvStd !='' "> and cInvStd = #{cInvStd}</if>
<if test="cInvCCode != null and cInvCCode !='' "> and cInvCCode = #{cInvCCode}</if>
<if test="cVenCode != null and cVenCode !='' "> and cVenCode = #{cVenCode}</if>
<if test="cReplaceItem != null and cReplaceItem !='' "> and cReplaceItem = #{cReplaceItem}</if>
<if test="cPosition != null and cPosition !='' "> and cPosition = #{cPosition}</if>
<if test="bSale != null and bSale !='' "> and bSale = #{bSale}</if>
<if test="bPurchase != null and bPurchase !='' "> and bPurchase = #{bPurchase}</if>
<if test="bSelf != null and bSelf !='' "> and bSelf = #{bSelf}</if>
<if test="bComsume != null and bComsume !='' "> and bComsume = #{bComsume}</if>
<if test="bProducing != null and bProducing !='' "> and bProducing = #{bProducing}</if>
<if test="bService != null and bService !='' "> and bService = #{bService}</if>
<if test="bAccessary != null and bAccessary !='' "> and bAccessary = #{bAccessary}</if>
<if test="iTaxRate != null "> and iTaxRate = #{iTaxRate}</if>
<if test="iInvWeight != null "> and iInvWeight = #{iInvWeight}</if>
<if test="iVolume != null "> and iVolume = #{iVolume}</if>
<if test="iInvRCost != null "> and iInvRCost = #{iInvRCost}</if>
<if test="iInvSPrice != null "> and iInvSPrice = #{iInvSPrice}</if>
<if test="iInvSCost != null "> and iInvSCost = #{iInvSCost}</if>
<if test="iInvLSCost != null "> and iInvLSCost = #{iInvLSCost}</if>
<if test="iInvNCost != null "> and iInvNCost = #{iInvNCost}</if>
<if test="iInvAdvance != null "> and iInvAdvance = #{iInvAdvance}</if>
<if test="iInvBatch != null "> and iInvBatch = #{iInvBatch}</if>
<if test="iSafeNum != null "> and iSafeNum = #{iSafeNum}</if>
<if test="iTopSum != null "> and iTopSum = #{iTopSum}</if>
<if test="iLowSum != null "> and iLowSum = #{iLowSum}</if>
<if test="iOverStock != null "> and iOverStock = #{iOverStock}</if>
<if test="cInvABC != null and cInvABC !='' "> and cInvABC = #{cInvABC}</if>
<if test="bInvQuality != null and bInvQuality !='' "> and bInvQuality = #{bInvQuality}</if>
<if test="bInvBatch != null and bInvBatch !='' "> and bInvBatch = #{bInvBatch}</if>
<if test="bInvEntrust != null and bInvEntrust !='' "> and bInvEntrust = #{bInvEntrust}</if>
<if test="bInvOverStock != null and bInvOverStock !='' "> and bInvOverStock = #{bInvOverStock}</if>
<if test="dSDate != null and dSDate !='' "> and dSDate = #{dSDate}</if>
<if test="dEDate != null and dEDate !='' "> and dEDate = #{dEDate}</if>
<if test="bFree1 != null and bFree1 !='' "> and bFree1 = #{bFree1}</if>
<if test="bFree2 != null and bFree2 !='' "> and bFree2 = #{bFree2}</if>
<if test="cInvDefine1 != null and cInvDefine1 !='' "> and cInvDefine1 = #{cInvDefine1}</if>
<if test="cInvDefine2 != null and cInvDefine2 !='' "> and cInvDefine2 = #{cInvDefine2}</if>
<if test="cInvDefine3 != null and cInvDefine3 !='' "> and cInvDefine3 = #{cInvDefine3}</if>
<if test="I_id != null "> and I_id = #{I_id}</if>
<if test="bInvType != null and bInvType !='' "> and bInvType = #{bInvType}</if>
<if test="iInvMPCost != null "> and iInvMPCost = #{iInvMPCost}</if>
<if test="cQuality != null and cQuality !='' "> and cQuality = #{cQuality}</if>
<if test="iInvSaleCost != null "> and iInvSaleCost = #{iInvSaleCost}</if>
<if test="iInvSCost1 != null "> and iInvSCost1 = #{iInvSCost1}</if>
<if test="iInvSCost2 != null "> and iInvSCost2 = #{iInvSCost2}</if>
<if test="iInvSCost3 != null "> and iInvSCost3 = #{iInvSCost3}</if>
<if test="bFree3 != null and bFree3 !='' "> and bFree3 = #{bFree3}</if>
<if test="bFree4 != null and bFree4 !='' "> and bFree4 = #{bFree4}</if>
<if test="bFree5 != null and bFree5 !='' "> and bFree5 = #{bFree5}</if>
<if test="bFree6 != null and bFree6 !='' "> and bFree6 = #{bFree6}</if>
<if test="bFree7 != null and bFree7 !='' "> and bFree7 = #{bFree7}</if>
<if test="bFree8 != null and bFree8 !='' "> and bFree8 = #{bFree8}</if>
<if test="bFree9 != null and bFree9 !='' "> and bFree9 = #{bFree9}</if>
<if test="bFree10 != null and bFree10 !='' "> and bFree10 = #{bFree10}</if>
<if test="cCreatePerson != null and cCreatePerson !='' "> and cCreatePerson = #{cCreatePerson}</if>
<if test="cModifyPerson != null and cModifyPerson !='' "> and cModifyPerson = #{cModifyPerson}</if>
<if test="dModifyDate != null and dModifyDate !='' "> and dModifyDate = #{dModifyDate}</if>
<if test="fSubscribePoint != null "> and fSubscribePoint = #{fSubscribePoint}</if>
<if test="fVagQuantity != null "> and fVagQuantity = #{fVagQuantity}</if>
<if test="cValueType != null and cValueType !='' "> and cValueType = #{cValueType}</if>
<if test="bFixExch != null and bFixExch !='' "> and bFixExch = #{bFixExch}</if>
<if test="fOutExcess != null "> and fOutExcess = #{fOutExcess}</if>
<if test="fInExcess != null "> and fInExcess = #{fInExcess}</if>
<if test="iMassDate != null and iMassDate !='' "> and iMassDate = #{iMassDate}</if>
<if test="iWarnDays != null and iWarnDays !='' "> and iWarnDays = #{iWarnDays}</if>
<if test="fExpensesExch != null "> and fExpensesExch = #{fExpensesExch}</if>
<if test="bTrack != null and bTrack !='' "> and bTrack = #{bTrack}</if>
<if test="bSerial != null and bSerial !='' "> and bSerial = #{bSerial}</if>
<if test="bBarCode != null and bBarCode !='' "> and bBarCode = #{bBarCode}</if>
<if test="iId != null "> and iId = #{iId}</if>
<if test="cBarCode != null and cBarCode !='' "> and cBarCode = #{cBarCode}</if>
<if test="cInvDefine4 != null and cInvDefine4 !='' "> and cInvDefine4 = #{cInvDefine4}</if>
<if test="cInvDefine5 != null and cInvDefine5 !='' "> and cInvDefine5 = #{cInvDefine5}</if>
<if test="cInvDefine6 != null and cInvDefine6 !='' "> and cInvDefine6 = #{cInvDefine6}</if>
<if test="cInvDefine7 != null and cInvDefine7 !='' "> and cInvDefine7 = #{cInvDefine7}</if>
<if test="cInvDefine8 != null and cInvDefine8 !='' "> and cInvDefine8 = #{cInvDefine8}</if>
<if test="cInvDefine9 != null and cInvDefine9 !='' "> and cInvDefine9 = #{cInvDefine9}</if>
<if test="cInvDefine10 != null and cInvDefine10 !='' "> and cInvDefine10 = #{cInvDefine10}</if>
<if test="cInvDefine11 != null "> and cInvDefine11 = #{cInvDefine11}</if>
<if test="cInvDefine12 != null "> and cInvDefine12 = #{cInvDefine12}</if>
<if test="cInvDefine13 != null "> and cInvDefine13 = #{cInvDefine13}</if>
<if test="cInvDefine14 != null "> and cInvDefine14 = #{cInvDefine14}</if>
<if test="cInvDefine15 != null and cInvDefine15 !='' "> and cInvDefine15 = #{cInvDefine15}</if>
<if test="cInvDefine16 != null and cInvDefine16 !='' "> and cInvDefine16 = #{cInvDefine16}</if>
<if test="iGroupType != null and iGroupType !='' "> and iGroupType = #{iGroupType}</if>
<if test="cGroupCode != null and cGroupCode !='' "> and cGroupCode = #{cGroupCode}</if>
<if test="cComUnitCode != null and cComUnitCode !='' "> and cComUnitCode = #{cComUnitCode}</if>
<if test="cAssComUnitCode != null and cAssComUnitCode !='' "> and cAssComUnitCode = #{cAssComUnitCode}</if>
<if test="cSAComUnitCode != null and cSAComUnitCode !='' "> and cSAComUnitCode = #{cSAComUnitCode}</if>
<if test="cPUComUnitCode != null and cPUComUnitCode !='' "> and cPUComUnitCode = #{cPUComUnitCode}</if>
<if test="cSTComUnitCode != null and cSTComUnitCode !='' "> and cSTComUnitCode = #{cSTComUnitCode}</if>
<if test="cCAComUnitCode != null and cCAComUnitCode !='' "> and cCAComUnitCode = #{cCAComUnitCode}</if>
<if test="cFrequency != null and cFrequency !='' "> and cFrequency = #{cFrequency}</if>
<if test="iFrequency != null and iFrequency !='' "> and iFrequency = #{iFrequency}</if>
<if test="iDays != null and iDays !='' "> and iDays = #{iDays}</if>
<if test="dLastDate != null and dLastDate !='' "> and dLastDate = #{dLastDate}</if>
<if test="iWastage != null "> and iWastage = #{iWastage}</if>
<if test="bSolitude != null and bSolitude !='' "> and bSolitude = #{bSolitude}</if>
<if test="cEnterprise != null and cEnterprise !='' "> and cEnterprise = #{cEnterprise}</if>
<if test="cAddress != null and cAddress !='' "> and cAddress = #{cAddress}</if>
<if test="cFile != null and cFile !='' "> and cFile = #{cFile}</if>
<if test="cLabel != null and cLabel !='' "> and cLabel = #{cLabel}</if>
<if test="cCheckOut != null and cCheckOut !='' "> and cCheckOut = #{cCheckOut}</if>
<if test="cLicence != null and cLicence !='' "> and cLicence = #{cLicence}</if>
<if test="bSpecialties != null and bSpecialties !='' "> and bSpecialties = #{bSpecialties}</if>
<if test="cDefWareHouse != null and cDefWareHouse !='' "> and cDefWareHouse = #{cDefWareHouse}</if>
<if test="iHighPrice != null "> and iHighPrice = #{iHighPrice}</if>
<if test="iExpSaleRate != null "> and iExpSaleRate = #{iExpSaleRate}</if>
<if test="cPriceGroup != null and cPriceGroup !='' "> and cPriceGroup = #{cPriceGroup}</if>
<if test="cOfferGrade != null and cOfferGrade !='' "> and cOfferGrade = #{cOfferGrade}</if>
<if test="iOfferRate != null "> and iOfferRate = #{iOfferRate}</if>
<if test="cMonth != null and cMonth !='' "> and cMonth = #{cMonth}</if>
<if test="iAdvanceDate != null and iAdvanceDate !='' "> and iAdvanceDate = #{iAdvanceDate}</if>
<if test="cCurrencyName != null and cCurrencyName !='' "> and cCurrencyName = #{cCurrencyName}</if>
<if test="cProduceAddress != null and cProduceAddress !='' "> and cProduceAddress = #{cProduceAddress}</if>
<if test="cProduceNation != null and cProduceNation !='' "> and cProduceNation = #{cProduceNation}</if>
<if test="cRegisterNo != null and cRegisterNo !='' "> and cRegisterNo = #{cRegisterNo}</if>
<if test="cEnterNo != null and cEnterNo !='' "> and cEnterNo = #{cEnterNo}</if>
<if test="cPackingType != null and cPackingType !='' "> and cPackingType = #{cPackingType}</if>
<if test="cEnglishName != null and cEnglishName !='' "> and cEnglishName = #{cEnglishName}</if>
<if test="bPropertyCheck != null and bPropertyCheck !='' "> and bPropertyCheck = #{bPropertyCheck}</if>
<if test="cPreparationType != null and cPreparationType !='' "> and cPreparationType = #{cPreparationType}</if>
<if test="cCommodity != null and cCommodity !='' "> and cCommodity = #{cCommodity}</if>
<if test="iRecipeBatch != null and iRecipeBatch !='' "> and iRecipeBatch = #{iRecipeBatch}</if>
<if test="cNotPatentName != null and cNotPatentName !='' "> and cNotPatentName = #{cNotPatentName}</if>
<if test="pubufts != null and pubufts !='' "> and pubufts = #{pubufts}</if>
<if test="bPromotSales != null and bPromotSales !='' "> and bPromotSales = #{bPromotSales}</if>
<if test="iPlanPolicy != null and iPlanPolicy !='' "> and iPlanPolicy = #{iPlanPolicy}</if>
<if test="iROPMethod != null and iROPMethod !='' "> and iROPMethod = #{iROPMethod}</if>
<if test="iBatchRule != null and iBatchRule !='' "> and iBatchRule = #{iBatchRule}</if>
<if test="fBatchIncrement != null "> and fBatchIncrement = #{fBatchIncrement}</if>
<if test="iAssureProvideDays != null "> and iAssureProvideDays = #{iAssureProvideDays}</if>
<if test="iTestStyle != null and iTestStyle !='' "> and iTestStyle = #{iTestStyle}</if>
<if test="iDTMethod != null and iDTMethod !='' "> and iDTMethod = #{iDTMethod}</if>
<if test="fDTRate != null "> and fDTRate = #{fDTRate}</if>
<if test="fDTNum != null "> and fDTNum = #{fDTNum}</if>
<if test="cDTUnit != null and cDTUnit !='' "> and cDTUnit = #{cDTUnit}</if>
<if test="iDTStyle != null and iDTStyle !='' "> and iDTStyle = #{iDTStyle}</if>
<if test="iQTMethod != null "> and iQTMethod = #{iQTMethod}</if>
<if test="PictureGUID != null and PictureGUID !='' "> and PictureGUID = #{PictureGUID}</if>
<if test="bPlanInv != null and bPlanInv !='' "> and bPlanInv = #{bPlanInv}</if>
<if test="bProxyForeign != null and bProxyForeign !='' "> and bProxyForeign = #{bProxyForeign}</if>
<if test="bATOModel != null and bATOModel !='' "> and bATOModel = #{bATOModel}</if>
<if test="bCheckItem != null and bCheckItem !='' "> and bCheckItem = #{bCheckItem}</if>
<if test="bPTOModel != null and bPTOModel !='' "> and bPTOModel = #{bPTOModel}</if>
<if test="bEquipment != null and bEquipment !='' "> and bEquipment = #{bEquipment}</if>
<if test="cProductUnit != null and cProductUnit !='' "> and cProductUnit = #{cProductUnit}</if>
<if test="fOrderUpLimit != null "> and fOrderUpLimit = #{fOrderUpLimit}</if>
<if test="cMassUnit != null and cMassUnit !='' "> and cMassUnit = #{cMassUnit}</if>
<if test="fRetailPrice != null "> and fRetailPrice = #{fRetailPrice}</if>
<if test="cInvDepCode != null and cInvDepCode !='' "> and cInvDepCode = #{cInvDepCode}</if>
<if test="iAlterAdvance != null "> and iAlterAdvance = #{iAlterAdvance}</if>
<if test="fAlterBaseNum != null "> and fAlterBaseNum = #{fAlterBaseNum}</if>
<if test="cPlanMethod != null and cPlanMethod !='' "> and cPlanMethod = #{cPlanMethod}</if>
<if test="bMPS != null and bMPS !='' "> and bMPS = #{bMPS}</if>
<if test="bROP != null and bROP !='' "> and bROP = #{bROP}</if>
<if test="bRePlan != null and bRePlan !='' "> and bRePlan = #{bRePlan}</if>
<if test="cSRPolicy != null and cSRPolicy !='' "> and cSRPolicy = #{cSRPolicy}</if>
<if test="bBillUnite != null and bBillUnite !='' "> and bBillUnite = #{bBillUnite}</if>
<if test="iSupplyDay != null "> and iSupplyDay = #{iSupplyDay}</if>
<if test="fSupplyMulti != null "> and fSupplyMulti = #{fSupplyMulti}</if>
<if test="fMinSupply != null "> and fMinSupply = #{fMinSupply}</if>
<if test="bCutMantissa != null and bCutMantissa !='' "> and bCutMantissa = #{bCutMantissa}</if>
<if test="cInvPersonCode != null and cInvPersonCode !='' "> and cInvPersonCode = #{cInvPersonCode}</if>
<if test="iInvTfId != null "> and iInvTfId = #{iInvTfId}</if>
<if test="cEngineerFigNo != null and cEngineerFigNo !='' "> and cEngineerFigNo = #{cEngineerFigNo}</if>
<if test="bInTotalCost != null and bInTotalCost !='' "> and bInTotalCost = #{bInTotalCost}</if>
<if test="iSupplyType != null and iSupplyType !='' "> and iSupplyType = #{iSupplyType}</if>
<if test="bConfigFree1 != null and bConfigFree1 !='' "> and bConfigFree1 = #{bConfigFree1}</if>
<if test="bConfigFree2 != null and bConfigFree2 !='' "> and bConfigFree2 = #{bConfigFree2}</if>
<if test="bConfigFree3 != null and bConfigFree3 !='' "> and bConfigFree3 = #{bConfigFree3}</if>
<if test="bConfigFree4 != null and bConfigFree4 !='' "> and bConfigFree4 = #{bConfigFree4}</if>
<if test="bConfigFree5 != null and bConfigFree5 !='' "> and bConfigFree5 = #{bConfigFree5}</if>
<if test="bConfigFree6 != null and bConfigFree6 !='' "> and bConfigFree6 = #{bConfigFree6}</if>
<if test="bConfigFree7 != null and bConfigFree7 !='' "> and bConfigFree7 = #{bConfigFree7}</if>
<if test="bConfigFree8 != null and bConfigFree8 !='' "> and bConfigFree8 = #{bConfigFree8}</if>
<if test="bConfigFree9 != null and bConfigFree9 !='' "> and bConfigFree9 = #{bConfigFree9}</if>
<if test="bConfigFree10 != null and bConfigFree10 !='' "> and bConfigFree10 = #{bConfigFree10}</if>
<if test="iDTLevel != null and iDTLevel !='' "> and iDTLevel = #{iDTLevel}</if>
<if test="cDTAQL != null and cDTAQL !='' "> and cDTAQL = #{cDTAQL}</if>
<if test="bPeriodDT != null and bPeriodDT !='' "> and bPeriodDT = #{bPeriodDT}</if>
<if test="cDTPeriod != null and cDTPeriod !='' "> and cDTPeriod = #{cDTPeriod}</if>
<if test="iBigMonth != null "> and iBigMonth = #{iBigMonth}</if>
<if test="iBigDay != null "> and iBigDay = #{iBigDay}</if>
<if test="iSmallMonth != null "> and iSmallMonth = #{iSmallMonth}</if>
<if test="iSmallDay != null "> and iSmallDay = #{iSmallDay}</if>
<if test="bOutInvDT != null and bOutInvDT !='' "> and bOutInvDT = #{bOutInvDT}</if>
<if test="bBackInvDT != null and bBackInvDT !='' "> and bBackInvDT = #{bBackInvDT}</if>
<if test="iEndDTStyle != null and iEndDTStyle !='' "> and iEndDTStyle = #{iEndDTStyle}</if>
<if test="bDTWarnInv != null and bDTWarnInv !='' "> and bDTWarnInv = #{bDTWarnInv}</if>
<if test="fBackTaxRate != null "> and fBackTaxRate = #{fBackTaxRate}</if>
<if test="cCIQCode != null and cCIQCode !='' "> and cCIQCode = #{cCIQCode}</if>
<if test="cWGroupCode != null and cWGroupCode !='' "> and cWGroupCode = #{cWGroupCode}</if>
<if test="cWUnit != null and cWUnit !='' "> and cWUnit = #{cWUnit}</if>
<if test="fGrossW != null "> and fGrossW = #{fGrossW}</if>
<if test="cVGroupCode != null and cVGroupCode !='' "> and cVGroupCode = #{cVGroupCode}</if>
<if test="cVUnit != null and cVUnit !='' "> and cVUnit = #{cVUnit}</if>
<if test="fLength != null "> and fLength = #{fLength}</if>
<if test="fWidth != null "> and fWidth = #{fWidth}</if>
<if test="fHeight != null "> and fHeight = #{fHeight}</if>
<if test="iDTUCounter != null "> and iDTUCounter = #{iDTUCounter}</if>
<if test="iDTDCounter != null "> and iDTDCounter = #{iDTDCounter}</if>
<if test="iBatchCounter != null "> and iBatchCounter = #{iBatchCounter}</if>
<if test="cShopUnit != null and cShopUnit !='' "> and cShopUnit = #{cShopUnit}</if>
<if test="cPurPersonCode != null and cPurPersonCode !='' "> and cPurPersonCode = #{cPurPersonCode}</if>
<if test="bImportMedicine != null and bImportMedicine !='' "> and bImportMedicine = #{bImportMedicine}</if>
<if test="bFirstBusiMedicine != null and bFirstBusiMedicine !='' "> and bFirstBusiMedicine = #{bFirstBusiMedicine}</if>
<if test="bForeExpland != null and bForeExpland !='' "> and bForeExpland = #{bForeExpland}</if>
<if test="cInvPlanCode != null and cInvPlanCode !='' "> and cInvPlanCode = #{cInvPlanCode}</if>
<if test="fConvertRate != null "> and fConvertRate = #{fConvertRate}</if>
<if test="dReplaceDate != null and dReplaceDate !='' "> and dReplaceDate = #{dReplaceDate}</if>
<if test="bInvModel != null and bInvModel !='' "> and bInvModel = #{bInvModel}</if>
<if test="bKCCutMantissa != null and bKCCutMantissa !='' "> and bKCCutMantissa = #{bKCCutMantissa}</if>
<if test="bReceiptByDT != null and bReceiptByDT !='' "> and bReceiptByDT = #{bReceiptByDT}</if>
<if test="iImpTaxRate != null "> and iImpTaxRate = #{iImpTaxRate}</if>
<if test="iExpTaxRate != null "> and iExpTaxRate = #{iExpTaxRate}</if>
<if test="bExpSale != null and bExpSale !='' "> and bExpSale = #{bExpSale}</if>
<if test="iDrawBatch != null "> and iDrawBatch = #{iDrawBatch}</if>
<if test="bCheckBSATP != null and bCheckBSATP !='' "> and bCheckBSATP = #{bCheckBSATP}</if>
<if test="cInvProjectCode != null and cInvProjectCode !='' "> and cInvProjectCode = #{cInvProjectCode}</if>
<if test="iTestRule != null and iTestRule !='' "> and iTestRule = #{iTestRule}</if>
<if test="cRuleCode != null and cRuleCode !='' "> and cRuleCode = #{cRuleCode}</if>
<if test="bCheckFree1 != null and bCheckFree1 !='' "> and bCheckFree1 = #{bCheckFree1}</if>
<if test="bCheckFree2 != null and bCheckFree2 !='' "> and bCheckFree2 = #{bCheckFree2}</if>
<if test="bCheckFree3 != null and bCheckFree3 !='' "> and bCheckFree3 = #{bCheckFree3}</if>
<if test="bCheckFree4 != null and bCheckFree4 !='' "> and bCheckFree4 = #{bCheckFree4}</if>
<if test="bCheckFree5 != null and bCheckFree5 !='' "> and bCheckFree5 = #{bCheckFree5}</if>
<if test="bCheckFree6 != null and bCheckFree6 !='' "> and bCheckFree6 = #{bCheckFree6}</if>
<if test="bCheckFree7 != null and bCheckFree7 !='' "> and bCheckFree7 = #{bCheckFree7}</if>
<if test="bCheckFree8 != null and bCheckFree8 !='' "> and bCheckFree8 = #{bCheckFree8}</if>
<if test="bCheckFree9 != null and bCheckFree9 !='' "> and bCheckFree9 = #{bCheckFree9}</if>
<if test="bCheckFree10 != null and bCheckFree10 !='' "> and bCheckFree10 = #{bCheckFree10}</if>
<if test="bBomMain != null and bBomMain !='' "> and bBomMain = #{bBomMain}</if>
<if test="bBomSub != null and bBomSub !='' "> and bBomSub = #{bBomSub}</if>
<if test="bProductBill != null and bProductBill !='' "> and bProductBill = #{bProductBill}</if>
<if test="iCheckATP != null and iCheckATP !='' "> and iCheckATP = #{iCheckATP}</if>
<if test="iInvATPId != null "> and iInvATPId = #{iInvATPId}</if>
<if test="iPlanTfDay != null "> and iPlanTfDay = #{iPlanTfDay}</if>
<if test="iOverlapDay != null "> and iOverlapDay = #{iOverlapDay}</if>
<if test="bPiece != null and bPiece !='' "> and bPiece = #{bPiece}</if>
<if test="bSrvItem != null and bSrvItem !='' "> and bSrvItem = #{bSrvItem}</if>
<if test="bSrvFittings != null and bSrvFittings !='' "> and bSrvFittings = #{bSrvFittings}</if>
<if test="fMaxSupply != null "> and fMaxSupply = #{fMaxSupply}</if>
<if test="fMinSplit != null "> and fMinSplit = #{fMinSplit}</if>
<if test="bSpecialOrder != null and bSpecialOrder !='' "> and bSpecialOrder = #{bSpecialOrder}</if>
<if test="bTrackSaleBill != null and bTrackSaleBill !='' "> and bTrackSaleBill = #{bTrackSaleBill}</if>
<if test="cInvMnemCode != null and cInvMnemCode !='' "> and cInvMnemCode = #{cInvMnemCode}</if>
<if test="iPlanDefault != null and iPlanDefault !='' "> and iPlanDefault = #{iPlanDefault}</if>
<if test="iPFBatchQty != null "> and iPFBatchQty = #{iPFBatchQty}</if>
<if test="iAllocatePrintDgt != null "> and iAllocatePrintDgt = #{iAllocatePrintDgt}</if>
<if test="bCheckBatch != null and bCheckBatch !='' "> and bCheckBatch = #{bCheckBatch}</if>
<if test="bMngOldpart != null and bMngOldpart !='' "> and bMngOldpart = #{bMngOldpart}</if>
<if test="iOldpartMngRule != null and iOldpartMngRule !='' "> and iOldpartMngRule = #{iOldpartMngRule}</if>
</trim>
</update>
<!-- 物理删除 -->
<delete id="InventoryEntity_delete" parameterType="com.hzya.frame.base.inventory.entity.InventoryEntity">
delete from Inventory where id =#{id}
</delete>
</mapper> </mapper>

55
fw-u8/src/main/java/com/hzya/frame/u8/base/inventory/service/impl/InventoryService.java
View File

@ -1,6 +1,8 @@
package com.hzya.frame.u8.base.inventory.service.impl; package com.hzya.frame.u8.base.inventory.service.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DS;
import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.basedao.service.impl.BaseService;
import com.hzya.frame.serviceUtil.ServiceUtil; import com.hzya.frame.serviceUtil.ServiceUtil;
@ -13,6 +15,7 @@ import com.hzya.frame.u8.base.inventory.entity.InventorySubEntity;
import com.hzya.frame.u8.base.inventory.service.IBasPartService; import com.hzya.frame.u8.base.inventory.service.IBasPartService;
import com.hzya.frame.u8.base.inventory.service.IInventoryService; import com.hzya.frame.u8.base.inventory.service.IInventoryService;
import com.hzya.frame.u8.base.inventory.service.IInventorySubService; import com.hzya.frame.u8.base.inventory.service.IInventorySubService;
import com.hzya.frame.web.exception.BaseSystemException;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -20,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.function.Supplier;
/** /**
* @Description * @Description
@ -67,6 +71,7 @@ public class InventoryService extends BaseService<InventoryEntity,String> implem
@DS("#entity.dataSourceCode") @DS("#entity.dataSourceCode")
@Override @Override
public void saveInventory(InventoryEntity entity) throws Exception { public void saveInventory(InventoryEntity entity) throws Exception {
checkInventory("save",entity);
//保存存货信息 //保存存货信息
inventoryDao.save(entity); inventoryDao.save(entity);
//保存子表数据 //保存子表数据
@ -86,22 +91,37 @@ public class InventoryService extends BaseService<InventoryEntity,String> implem
subService.update(subEntity); subService.update(subEntity);
} }
//保存自定义表 //保存自定义表
//先查一下bas_part有没有
BasPartEntity part = new BasPartEntity(); BasPartEntity part = new BasPartEntity();
part.setInvCode(entity.getcInvCode()); part.setInvCode(entity.getcInvCode());
//先查一下有没有保存过
List<BasPartEntity> partList = basPartService.query(part); List<BasPartEntity> partList = basPartService.query(part);
if (CollectionUtils.isEmpty(partList)){ if (CollectionUtils.isEmpty(partList)){
//查最大流水号 UAIdentityEntity uaIdentityEntity = new UAIdentityEntity();
UAIdentityEntity uaidenIdentity = uaIdentityService.queryMaxSaleOrderId("", "bas_part"); uaIdentityEntity.setCacc_id("002");
if (null != uaidenIdentity){ uaIdentityEntity.setcVouchType("bas_part");
List<UAIdentityEntity> identityList = uaIdentityService.query(uaIdentityEntity);
if (CollectionUtils.isNotEmpty(identityList)){
UAIdentityEntity uaIdentity = identityList.get(0);
if (null != uaIdentity){
BasPartEntity basPartEntity = new BasPartEntity(); BasPartEntity basPartEntity = new BasPartEntity();
basPartEntity.setInvCode(entity.getcInvCode()); basPartEntity.setInvCode(entity.getcInvCode());
Integer id_num_add = uaidenIdentity.getiFatherId()+1;// +1 Integer id_num_add = uaIdentity.getiFatherId()+1;// +1
long max_id = 1000000000 + id_num_add;//前面拼接上1000000000 long max_id = 1000000000 + id_num_add;//前面拼接上1000000000
//更新最大编号 //更新最大编号
uaidenIdentity.setCacc_id("002"); uaIdentity.setCacc_id("002");
uaidenIdentity.setcVouchType("bas_part"); uaIdentity.setcVouchType("bas_part");
uaIdentityService.updateMaxSaleOrderId(uaidenIdentity); //最大号+1
UAIdentityEntity identity = new UAIdentityEntity();
identity.setCacc_id(uaIdentity.getCacc_id());
identity.setcVouchType(uaIdentity.getcVouchType());
identity.setiFatherId(uaIdentity.getiFatherId());
identity.setiChildId(uaIdentity.getiChildId());
uaIdentityService.updateMaxSaleOrderId(identity);
basPartEntity.setPartId(String.valueOf(max_id));
basPartEntity.setInvCode(entity.getcInvCode());
logger.info("======物料编码"+entity.getcInvCode()+"，生成的bas_part最大id"+max_id);
basPartService.save(basPartEntity);
}
} }
} }
} }
@ -115,6 +135,25 @@ public class InventoryService extends BaseService<InventoryEntity,String> implem
@DS("#entity.dataSourceCode") @DS("#entity.dataSourceCode")
@Override @Override
public void updateInventory(InventoryEntity entity) throws Exception { public void updateInventory(InventoryEntity entity) throws Exception {
checkInventory("update",entity);
inventoryDao.update(entity);
}
/**
* 必填校验
* @param type
* @param entity
*/
private void checkInventory(String type,InventoryEntity entity){
Assert.notNull(entity,()-> new BaseSystemException("参数不能为空"));
Assert.notEmpty(entity.getcInvCode(),()-> new BaseSystemException("存货编码不能为空"));
Assert.notEmpty(entity.getDataSourceCode(),()-> new BaseSystemException("数据源编码不能为空"));
Assert.notEmpty(entity.getAcc_name(),()-> new BaseSystemException("账套号不能为空"));
switch (type) {
case "save":
break;
case "update":
break;
}
} }
} }