@ -124,6 +124,9 @@
<result column= "flagForOpenDepository" property= "flagForOpenDepository" jdbcType= "INTEGER" />
<result column= "editUser" property= "editUser" jdbcType= "VARCHAR" />
<result column= "mbrand" property= "mbrand" jdbcType= "VARCHAR" />
<result column= "flagForAgency" property= "flagForAgency" jdbcType= "INTEGER" />
<result column= "createUid" property= "createUid" jdbcType= "INTEGER" />
</resultMap>
@ -177,7 +180,7 @@
<sql id= "ApplicationOutRecordInfo" >
aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage,
depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname,
cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion,flagForOpenDepository
cuintroduce,cuaddress,outTime,abstract,outType,editUser,mbrand,mversion,flagForOpenDepository,createUid,flagForAgency
</sql>
<sql id= "ApplicationOutRecordMinInfo" >
@ -185,8 +188,7 @@
</sql>
<!-- 查询所有数据行数 -->
<select id= "findCount" resultType= "integer" >
SELECT
count(*)
SELECT count(*)
FROM depository_record dr
</select>
<!-- 查询相应用户的任务数 -->
@ -362,9 +364,6 @@
</select>
<!-- 根据条件查询入库记录 -->
<select id= "findApplicationInRecordByDepository" parameterType= "String" resultMap= "applicationInRecord" >
select
@ -744,8 +743,6 @@
</select>
<select id= "findApplicationInRecordPByDepositoryList" resultMap= "applicationInRecord" parameterType= "list" >
select
<include refid= "ApplicationInRecordInfo" />
@ -760,8 +757,6 @@
</select>
<select id= "findApplicationInRecordPForAPeriodOfTime" resultMap= "applicationInRecord" >
select
<include refid= "ApplicationInRecordInfo" />
@ -822,7 +817,6 @@
</select>
<select id= "findApplicationOutByCode" parameterType= "string" resultMap= "applicationOutRecord" >
select
<include refid= "ApplicationOutRecordInfo" />
@ -1048,9 +1042,10 @@
<!-- 插入一条入库记录 -->
<insert id= "insertApplicationInRecord" parameterType= "map" useGeneratedKeys= "true" keyProperty= "id" >
insert into application_in_record (id,mid,quantity,price,applicant_id,applicant_time,depository_id,code,applyRemark,unit,flagForGroup,placeId,approverPass,approverTime,approverId,state,approverMessage,mproducedDate,toGroupId)
values(
#{id},
insert into application_in_record (id, mid, quantity, price, applicant_id, applicant_time, depository_id, code,
applyRemark, unit, flagForGroup, placeId, approverPass, approverTime,
approverId, state, approverMessage, mproducedDate, toGroupId)
values (#{id},
#{mid},
#{quantity},
#{price},
@ -1068,8 +1063,7 @@
#{state},
#{approverMessage},
#{producedDate},
#{toGroupId}
)
#{toGroupId})
</insert>
<!-- 插入一条出库记录 -->
@ -1078,7 +1072,7 @@
(id,applicant_id,applicant_time,code,depository_id,price,quantity,departmenthead,departmenthead_pass,departmenthead_time,
departmenthead_messgae,depository_manager,depository_manager_pass,depository_manager_time,
depository_manager_message,apply_remark,state,istransfer,placeId,pass,constructionunitid,
adminorgid,outType,abstract,flagForOpenDepository)
adminorgid,outType,abstract,flagForOpenDepository,createUid,flagForAgency )
values(
#{id},
#{applicantId},
@ -1125,15 +1119,17 @@
#{adminorgId},
#{outType},
#{abstract},
#{flagForOpenDepository}
#{flagForOpenDepository},
#{createUid},
#{flagForAgency}
)
</insert>
<!-- 插入一条出库子订单 -->
<insert id= "insertApplicationOutRecordMin" parameterType= "map" useGeneratedKeys= "true" keyProperty= "id" >
insert into application_out_record_min (id,mid,quantity,code,depositoryId,placeId,checkId,parentId,transferId,trueOut,unit,project)
values(
#{id},
insert into application_out_record_min (id, mid, quantity, code, depositoryId, placeId, checkId, parentId,
transferId, trueOut, unit, project)
values ( #{id},
#{mid},
#{quantity},
#{code},
@ -1144,8 +1140,7 @@
#{transferId},
#{trueOut},
#{unit},
#{project}
)
#{project})
</insert>
<!-- 查找子订单 -->
@ -1594,7 +1589,9 @@
<!-- 根据主键删除数据 -->
<delete id= "deleteDepositoryRecordById" parameterType= "integer" >
DELETE FROM depository_record WHERE id = #{id}
DELETE
FROM depository_record
WHERE id = #{id}
</delete>
<!-- 根据主键批量删除数据 -->
@ -1747,20 +1744,18 @@
<select id= "findWarehouseRecord" parameterType= "map" resultType= "int" >
select
count(*)
from
depository_record dr
where
dr.state like '%已%'
select count(*)
from depository_record dr
where dr.state like '%已%'
and dr.check_time between #{start} and #{end}
</select>
<!-- 根据主键删除数据 -->
<delete id= "deleteApplicationInRecordById" parameterType= "integer" >
DELETE FROM application_in_record WHERE id = #{id}
DELETE
FROM application_in_record
WHERE id = #{id}
</delete>
<!-- 根据主键批量删除数据 -->
@ -1773,7 +1768,9 @@
<!-- 根据主键删除数据 -->
<delete id= "deleteApplicationOutRecordById" parameterType= "integer" >
DELETE FROM application_out_record WHERE id = #{id}
DELETE
FROM application_out_record
WHERE id = #{id}
</delete>
<!-- 根据主键批量删除数据 -->
@ -1785,7 +1782,9 @@
</delete>
<delete id= "deleteApplicationOutRecordMinById" >
delete from application_out_record_min where parentId = #{id}
delete
from application_out_record_min
where parentId = #{id}
</delete>
<delete id= "deleteApplicationOutRecordMinByIds" parameterType= "list" >