~admin/igds-v4.git

			@@ -293,14 +293,12 @@
			<update id="reSumNoticeInComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
			update D_INOUT_NOTICE_IN t,(
			SELECT
			r.CUSTOMER_ID_,
			r.FOOD_VARIETY_,
			r.NOTICE_ID_,
			sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
			from d_inout_record r
			where r.COMPANY_ID_ = #{param.companyId}
			and r.DEPT_ID_ = #{param.deptId}
			and r.CUSTOMER_ID_ = #{param.customerId}
			and r.FOOD_VARIETY_ = #{param.foodVariety}
			and r.NOTICE_ID_ = #{param.id}
			and r.RECORD_STATUS_ != 'DEL'
			@@ -308,8 +306,8 @@
			GROUP BY r.FOOD_VARIETY_
			) b
			SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
			WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
			AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
			WHERE
			t.FOOD_VARIETY_ = b.FOOD_VARIETY_
			AND t.ID_ = b.NOTICE_ID_
			</update>

			@@ -465,7 +463,6 @@
			<update id="reSumNoticeOutComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
			update D_INOUT_NOTICE_OUT t,(
			SELECT
			r.CUSTOMER_ID_,
			r.FOOD_VARIETY_,
			r.DEPOT_ID_,
			r.NOTICE_ID_,
			@@ -473,7 +470,6 @@
			from d_inout_record r
			where r.COMPANY_ID_ = #{param.companyId}
			AND r.DEPT_ID_ = #{param.deptId}
			and r.CUSTOMER_ID_ = #{param.customerId}
			and r.DEPOT_ID_ = #{param.depotId}
			and r.FOOD_VARIETY_ = #{param.foodVariety}
			and r.RECORD_STATUS_ != 'DEL'
			@@ -481,8 +477,7 @@
			GROUP BY r.DEPOT_ID_
			) b
			SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
			WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
			AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
			WHERE t.FOOD_VARIETY_ = b.FOOD_VARIETY_
			AND t.DEPOT_ID_ = b.DEPOT_ID_
			AND t.ID_ = b.NOTICE_ID_
			</update>

			@@ -144,15 +144,15 @@
			</dependency>


			<!-- 接口包，包括上海接口和、气象接口、三维接口
			<!-- 接口包，包括上海接口和、气象接口、三维接口-->
			<dependency>
			<groupId>com.ld.igds</groupId>
			<artifactId>igds-api-inte</artifactId>
			<version>${igds.version}</version>
			</dependency>-->
			</dependency>


			<!-- 私有协议-风正致远
			<!-- 私有协议-风正致远-->
			<dependency>
			<groupId>com.ld.igds</groupId>
			<artifactId>igds-protocol-fzzy3</artifactId>
			@@ -167,7 +167,7 @@
			<groupId>log4j</groupId>
			</exclusion>
			</exclusions>
			</dependency>-->
			</dependency>

			<!-- MODBUS-TCP
			<dependency>
			@@ -204,7 +204,7 @@
			</exclusions>
			</dependency>-->

			<!-- 私有协议-贝博粮情
			<!-- 私有协议-贝博粮情-->
			<dependency>
			<groupId>com.ld.igds</groupId>
			<artifactId>igds-protocol-beibo</artifactId>
			@@ -219,9 +219,9 @@
			<groupId>log4j</groupId>
			</exclusion>
			</exclusions>
			</dependency>-->
			</dependency>

			<!-- 私有协议-DLT645电表协议
			<!-- 私有协议-DLT645电表协议-->
			<dependency>
			<groupId>com.ld.igds</groupId>
			<artifactId>igds-protocol-es</artifactId>
			@@ -236,9 +236,9 @@
			<groupId>log4j</groupId>
			</exclusion>
			</exclusions>
			</dependency>-->
			</dependency>

			<!-- 私有协议-邦海智能-->
			<!-- 私有协议-邦海智能
			<dependency>
			<groupId>com.ld.igds</groupId>
			<artifactId>igds-protocol-bhzn</artifactId>
			@@ -253,7 +253,7 @@
			<groupId>log4j</groupId>
			</exclusion>
			</exclusions>
			</dependency>
			</dependency>-->

			<!-- 私有协议-正来电子
			<dependency>
			@@ -272,7 +272,7 @@
			</exclusions>
			</dependency>-->

			<!-- 海康车牌识别-SDK-->
			<!-- 海康车牌识别-SDK
			<dependency>
			<groupId>com.ld.igds</groupId>
			<artifactId>igds-protocol-sdk</artifactId>
			@@ -287,7 +287,7 @@
			<groupId>log4j</groupId>
			</exclusion>
			</exclusions>
			</dependency>
			</dependency>-->
			</dependencies>

			<dependencyManagement>

	igds-inout/src/main/resources/mapper/InoutCommonMapper.xml	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/pom.xml	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史