Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java

@@ -375,11 +375,11 @@ public class HGKCTools {
 							HGConstant.StorageType.RK);
 					//查询当前工序
 					HGPZ005A hgpz005A = hgpz005AList.stream()
-							.filter(o -> o.getId().equals(hgkc003.getInventProcessId())).findAny().orElse(null);
+							.filter(o -> o.getId().equals(hgkc003.getInventProcessId()) && o.getInventCode().equals(hgkc003.getPrdtCode())).findAny().orElse(null);
 					AssertUtils.isNull(hgpz005A, "未获取到当前工序信息！");
 					//查询比当前工序靠后的工序是否存在,不存在说明是最后工序，修改实时库存
 					List<HGPZ005A> nextHgpz005AList = hgpz005AList.stream()
-							.filter(o -> o.getProcessOrder().compareTo(hgpz005A.getProcessOrder()) == 1)
+							.filter(o ->o.getInventCode().equals(hgpz005A.getInventCode()) && o.getProcessOrder().compareTo(hgpz005A.getProcessOrder()) == 1)
 							.collect(Collectors.toList());
 					if (CollectionUtils.isEmpty(nextHgpz005AList)) {
 						// 修改库存

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC101.java

@@ -6,6 +6,7 @@ import com.baosight.hggp.core.extapp.decheng.api.DcOpenApi;
 import com.baosight.hggp.core.extapp.decheng.model.DcContract;
 import com.baosight.hggp.core.extapp.decheng.model.DcContractList;
 import com.baosight.hggp.core.model.Pager;
+import com.baosight.hggp.core.tools.CodeValueTools;
 import com.baosight.hggp.core.utils.ThreadUtils;
 import com.baosight.hggp.hg.pz.domain.HGPZ009;
 import com.baosight.hggp.hg.pz.tools.HGPZTools;
@@ -232,8 +233,19 @@ public class ServiceHGSC101 extends ServiceEPBase {
 	 * @return
 	 */
 	private String getProjectSource(String name) {
+		List<Map> codesetMaps = CodeValueTools.getCodeValues("app.sc.projectSource");
+		if (CollectionUtils.isEmpty(codesetMaps)) {
 			ProjectSourceEnum projectSourceEnum = ProjectSourceEnum.getByName(name);
 			return projectSourceEnum == null ? ProjectSourceEnum.OTHER.getCode() : projectSourceEnum.getCode();
 		}
+		for (Map codesetMap : codesetMaps) {
+			String value = MapUtils.getString(codesetMap, "value");
+			String text = MapUtils.getString(codesetMap, "label");
+			if (text.equals(name)) {
+				return value;
+			}
+		}
+		return ProjectSourceEnum.OTHER.getCode();
+	}
 	
 }

src/main/resources/application.properties

@@ -18,7 +18,7 @@ spring.servlet.multipart.file-size-threshold=0
 componentEname=hggp
 projectName=hggp
 moduleName=ep
-projectEnv=run
+projectEnv=dev
 platSchema=iplat_hggp
 eplatSchema=EPLAT_HGGP
 lowcodedbSchema=lowcodedb_hggp
@@ -33,12 +33,12 @@ customerName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 enterpriseName=\u6B66\u6C49\u5B9D\u4FE1\u5927\u6570\u636E\u4E8B\u4E1A\u90E8
 datasource.type=dbcp
 jdbc.driverClassName=com.mysql.cj.jdbc.Driver
-jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-jdbc.username=hggp
-#jdbc.username=root
-jdbc.password=hggp_Twhxz2024Aly
-#jdbc.password=Whxz@2019
+#jdbc.url=jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+jdbc.url=jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#jdbc.username=hggp
+jdbc.username=root
+#jdbc.password=hggp_Twhxz2024Aly
+jdbc.password=Whxz@2019
 jdbc.maxActive=20
 jdbc.validationQuery=SELECT 1 FROM ${platSchema}.TEDFA00
 

src/main/resources/quartz.properties

@@ -22,12 +22,12 @@ org.quartz.jobStore.isClustered = true
 #\u6570\u636E\u5E93\u8FDE\u63A5\u914D\u7F6E\u4FE1\u606F
 org.quartz.jobStore.clusterCheckinInterval = 20000
 org.quartz.dataSource.appDS.driver = com.mysql.cj.jdbc.Driver
-org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-#org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
-org.quartz.dataSource.appDS.user = hggp
-#org.quartz.dataSource.appDS.user = root
-org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
-#org.quartz.dataSource.appDS.password = Whxz@2019
+#org.quartz.dataSource.appDS.URL = jdbc:mysql://rm-uf60e9vbmanleydq4.mysql.rds.aliyuncs.com:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+org.quartz.dataSource.appDS.URL = jdbc:mysql://129.211.46.84:3306/iplat_hggp?useSSL=false&useUnicode=true&characterEncoding=utf-8
+#org.quartz.dataSource.appDS.user = hggp
+org.quartz.dataSource.appDS.user = root
+#org.quartz.dataSource.appDS.password = hggp_Twhxz2024Aly
+org.quartz.dataSource.appDS.password = Whxz@2019
 org.quartz.dataSource.appDS.maxConnections = 30
 
 org.quartz.plugin.logging.class = com.baosight.xservices.ej.job.quartz.JobLoggingPluginWithPartition