~admin/igds-v4.git

			@@ -14,37 +14,35 @@
			TYPE_ as type,
			PROGRESS_ as progress,
			RECORD_STATUS_ as recordStatus,
			CUSTOMER_NAME_ as customerName,
			INTEL_CARD_ as intelCard,
			REGISTER_TIME_ as registerTime,
			REGISTER_USER_ as registerUser,
			USER_NAME_ as userName,
			USER_CONTACT_ as userContact,
			USER_ID_ as userId,
			USER_BIRTHDAY_ as userBirthday,
			USER_SEX_ as userSex,
			USER_NATION_ as userNation,
			USER_ID_ as userId,
			USER_CONTACT_ as userContact,
			USER_ADDRESS_ as userAddress,
			CUR_STORAGE_ as curStorage,
			INTEL_CARD_ as intelCard,
			PLATE_NUM_ as plateNum,
			TRANS_TYPE_ as transType,
			SPEC_TYPE_ as specType,
			CUSTOMER_ID_ as customerId,
			CUSTOMER_NAME_ as customerName,
			FOOD_VARIETY_ as foodVariety,
			FOOD_TYPE_ as foodType,
			FOOD_LEVEL_ as foodLevel,
			FOOD_LOCATION_ID_ as foodLocationId,
			FOOD_LOCATION_ as foodLocation,
			FOOD_YEAR_ as foodYear,
			CHECK_STATUS_ as checkStatus,
			CHECK_USER_ as checkUser,
			CHECK_TIME_ as checkTime,
			SAMPLE_USER_ as sampleUser,
			SAMPLE_TIME_ as sampleTime,
			SAMPLE_TYPE_ as sampleType,
			CHECK_ID_ as checkId,
			IMPURITY_ as impurity,
			WET_ as wet,
			DE_IMPURITY_ as deImpurity,
			DE_WET_ as deWet,
			DE_HANDLE_ as deHandle,
			DE_OTHER_ as deOther,
			DE_SUM_ as deSum,
			DE_CHECK_ as deCheck,
			ADD_CHECK_ as addCheck,
			jjlx as jjlx,
			FULL_WEIGHT_ as fullWeight,
			FULL_WEIGHT_TIME_ as fullWeightTime,
			FULL_WEIGHT_USER_ as fullWeightUser,
			@@ -52,16 +50,22 @@
			EMPTY_WEIGHT_TIME_ as emptyWeightTime,
			EMPTY_WEIGHT_USER_ as emptyWeightUser,
			NET_WEIGHT_ as netWeight,
			DE_HANDLE_ as deHandle,
			DE_PACKAGE_ as dePackage,
			DE_OTHER_ as deOther,
			DE_OTHER_INTO_ as deOtherInfo,
			SETTLE_WEIGHT_ as settleWeight,
			RECORD_WEIGHT_ as recordWeight,
			PRICE_ as price,
			SETTLE_MONEY_ as settleMoney,
			HANDLE_START_ as handleStart,
			HANDLE_END_ as handleEnd,
			SETTLE_ID_ as settleId,
			HANDLE_USER_ as handleUser,
			COMPLETE_TIME_ as completeTime,
			COMPLETE_USER_ as completeUser,
			REMARKS_ as remarks
			REMARKS_ as remarks,
			bzw as bzw,
			dbz as dbz,
			bzbjs as bzbjs
			</sql>

			<!-- 根据条件查询，数据必须是流程中的数据 -->
			@@ -262,7 +266,7 @@
			</update>


			<!-- 登记时候插入当前库存的值curStorage 之后不做更改 -->
			<!-- 新增数据 -->
			<insert id="insertData" parameterType="com.ld.igds.inout.dto.InoutData">
			insert into
			D_INOUT_RECORD(
			@@ -274,37 +278,35 @@
			TYPE_,
			PROGRESS_,
			RECORD_STATUS_,
			CUSTOMER_NAME_,
			INTEL_CARD_,
			REGISTER_TIME_,
			REGISTER_USER_,
			USER_NAME_,
			USER_CONTACT_,
			USER_ID_,
			USER_BIRTHDAY_,
			USER_SEX_,
			USER_NATION_,
			USER_ID_,
			USER_CONTACT_,
			USER_ADDRESS_,
			CUR_STORAGE_,
			INTEL_CARD_,
			PLATE_NUM_,
			TRANS_TYPE_,
			SPEC_TYPE_,
			CUSTOMER_ID_,
			CUSTOMER_NAME_,
			FOOD_VARIETY_,
			FOOD_TYPE_,
			FOOD_LEVEL_,
			FOOD_LOCATION_ID_,
			FOOD_LOCATION_,
			FOOD_YEAR_,
			CHECK_STATUS_,
			CHECK_USER_,
			CHECK_TIME_,
			SAMPLE_USER_,
			SAMPLE_TIME_,
			SAMPLE_TYPE_,
			CHECK_ID_,
			IMPURITY_,
			WET_,
			DE_IMPURITY_,
			DE_WET_,
			DE_HANDLE_,
			DE_OTHER_,
			DE_SUM_,
			DE_CHECK_,
			ADD_CHECK_,
			jjlx,
			FULL_WEIGHT_,
			FULL_WEIGHT_TIME_,
			FULL_WEIGHT_USER_,
			@@ -312,17 +314,23 @@
			EMPTY_WEIGHT_TIME_,
			EMPTY_WEIGHT_USER_,
			NET_WEIGHT_,
			DE_HANDLE_,
			DE_PACKAGE_,
			DE_OTHER_,
			DE_OTHER_INTO_,
			SETTLE_WEIGHT_,
			RECORD_WEIGHT_,
			PRICE_,
			SETTLE_MONEY_,
			HANDLE_START_,
			HANDLE_END_,
			SETTLE_ID_,
			HANDLE_USER_,
			COMPLETE_TIME_,
			COMPLETE_USER_,
			REMARKS_,
			SETTLE_TAG_
			bzw,
			dbz,
			bzbjs,
			UPDATE_TIME_
			)
			values
			(
			@@ -334,37 +342,35 @@
			#{data.type},
			#{data.progress},
			#{data.recordStatus},
			#{data.customerName},
			#{data.intelCard},
			#{data.registerTime},
			#{data.registerUser},
			#{data.userName},
			#{data.userContact},
			#{data.userId},
			#{data.userBirthday},
			#{data.userSex},
			#{data.userNation},
			#{data.userId},
			#{data.userContact},
			#{data.userAddress},
			#{data.curStorage},
			#{data.intelCard},
			#{data.plateNum},
			#{data.transType},
			#{data.specType},
			#{data.customerId},
			#{data.customerName},
			#{data.foodVariety},
			#{data.foodType},
			#{data.foodLevel},
			#{data.foodLocationId},
			#{data.foodLocation},
			#{data.foodYear},
			#{data.checkStatus},
			#{data.checkUser},
			#{data.checkTime},
			#{data.sampleUser},
			#{data.sampleTime},
			#{data.sampleType},
			#{data.checkId},
			#{data.impurity},
			#{data.wet},
			#{data.deImpurity},
			#{data.deWet},
			#{data.deHandle},
			#{data.deOther},
			#{data.deSum},
			#{data.deCheck},
			#{data.addCheck},
			#{data.jjlx},
			#{data.fullWeight},
			#{data.fullWeightTime},
			#{data.fullWeightUser},
			@@ -372,17 +378,23 @@
			#{data.emptyWeightTime},
			#{data.emptyWeightUser},
			#{data.netWeight},
			#{data.deHandle},
			#{data.dePackage},
			#{data.deOther},
			#{data.deOtherInfo},
			#{data.settleWeight},
			#{data.recordWeight},
			#{data.price},
			#{data.settleMoney},
			#{data.handleStart},
			#{data.handleEnd},
			#{data.settleId},
			#{data.handleUser},
			#{data.completeTime},
			#{data.completeUser},
			#{data.remarks},
			#{data.settleTag}
			#{data.bzw},
			#{data.dbz},
			#{data.bzbjs},
			#{data.updateTime}
			)
			</insert>

			@@ -520,4 +532,20 @@
			</if>
			</select>

			<!--根据车牌和卡号验证是否有重复信息-->
			<select id="checkExist" parameterType="com.ld.igds.inout.dto.InoutParam">
			select count(1)
			from
			D_INOUT_RECORD
			WHERE COMPANY_ID_ = #{param.companyId}
			AND TYPE_ = #{param.type}
			AND (PLATE_NUM_ = #{param.plateNum} or INTEL_CARD_ = #{param.intelCard})
			AND PROGRESS_ != 'RECORD'
			AND RECORD_STATUS_ != 'ERROR'
			AND RECORD_STATUS_ != 'DEL'
			<if test="param.start != null">
			AND REGISTER_TIME_ <![CDATA[ > ]]> #{param.start}
			</if>
			</select>

			</mapper>