2024-10-12 采购合同手工录入详情按照录入顺序排序，采购收货选择合同时按照合同明细顺序显示

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG002B.java

@@ -46,11 +46,12 @@ public class ServiceHGCG002B extends ServiceBase {
 	@OperationLogAnnotation(operModul = "采购合同", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(
+					DdynamicEnum.COMPANY_CODE_BLOCK_ID,
+					DdynamicEnum.SUP_RECORD_BLOCK_ID,
+					DdynamicEnum.INVENT_RECORD_BLOCK_ID,
+					DdynamicEnum.SPEC_NAME_BLOCK_ID,
+					DdynamicEnum.INVENT_TYPE_BOX_BLOCK_ID));
 			EiInfoUtils.addBlock(inInfo,"userByCompany", HGXSTools.XsUser.listAll(UserSessionUtils.getAccountCode()), User.class);
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BOX_BLOCK_ID),
 					new HashMap<String, Object>(){{

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG003A.java

@@ -49,10 +49,11 @@ public class ServiceHGCG003A extends ServiceBase {
 	@OperationLogAnnotation(operModul = "采购合同", operType = "查询", operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SUP_RECORD_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_RECORD_BLOCK_ID));
-			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.SPEC_NAME_BLOCK_ID));
+			CommonMethod.initBlock(inInfo, Arrays.asList(
+					DdynamicEnum.COMPANY_CODE_BLOCK_ID,
+					DdynamicEnum.SUP_RECORD_BLOCK_ID,
+					DdynamicEnum.INVENT_RECORD_BLOCK_ID,
+					DdynamicEnum.SPEC_NAME_BLOCK_ID));
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCG002B().eiMetadata);
 		} catch (PlatException e) {
 			LogUtils.setDetailMsg(inInfo, e, "初始化失败");

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG002A.xml

@@ -183,7 +183,7 @@
                 $orderBy$
             </isNotEmpty>
             <isEmpty property="orderBy">
-                ID asc
+                ID desc
             </isEmpty>
         </dynamic>
     </sql>
@@ -428,7 +428,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				a.ID desc
+				b.CONTRACT_DATE desc, b.CONTRACT_NO desc, a.ID desc
 			</isEmpty>
 		</dynamic>
 	</select>

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD002.java

@@ -58,7 +58,7 @@ public class ServiceHGWD002 extends ServiceBase {
 			// 未选择文件目录时，返回空
 			String fileId = MapUtils.getString(queryRow, HGWD001.FIELD_FILE_ID);
 			if (StringUtils.isBlank(fileId)) {
-				return inInfo;
+ 				return inInfo;
 			}
 			// 仅查询已发布的文件
 			queryRow.put(HGWD001.FIELD_STATUS, HgWdConstant.FileStatus.S_1);

src/main/webapp/HG/CG/HGCG002B.js

@@ -227,7 +227,7 @@ $(window).load(function () {
 	// 查询
 	query();
 
-	initInventCode();
+	//initInventCode();
 	let status = $("#inqu_status-0-status").val();
 	if(status != 0 && status != 2){
 		$(".k-grid-add").hide();
@@ -292,11 +292,11 @@ let save = function () {
 		return;
 	}
 	for (let i = 0; i < rows.length; i++) {
-		if(!isBlank(rows[i]['price']) && !isNumber(rows[i]['price'])){
+		if(isBlank(rows[i]['price']) || !isNumber(rows[i]['price'])){
 			message("勾选的第" + (i + 1) + "行单价不能小于0");
 			return;
 		}
-		if(!isBlank(rows[i]['taxRate']) && !isNumber(rows[i]['taxRate'])){
+		if(isBlank(rows[i]['taxRate']) || !isNumber(rows[i]['taxRate'])){
 			message("勾选的第" + (i + 1) + "行税率不能为空");
 			return;
 		}