Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC005A.java

@@ -265,7 +265,8 @@ public class ServiceHPSC005A extends ServiceBase {
 	 */
 	private void setBaseInfo(HPSC005A fSc005a) {
 		// 厂区名称
-		fSc005a.setFactoryName(HPPZTools.HpPz011.getFactoryName(fSc005a.getFactoryCode()));
+		//fSc005a.setFactoryName(HPPZTools.HpPz011.getFactoryName(fSc005a.getFactoryCode()));
+		fSc005a.setFactoryName(HPXSTools.XsOrg.get(fSc005a.getFactoryCode()).getOrgCname());
 		// 生产组名称
 		fSc005a.setOrgName(HPXSTools.XsOrg.get(fSc005a.getOrgNo()).getOrgCname());
 	}

src/main/webapp/HP/KC/HPKC005A.js

@@ -66,8 +66,13 @@ let select = function () {
 	}
 	for (let i = 0; i < rows.length; i++) {
 		let entityAmount = rows[i]['entityAmount'];
+		let amount = rows[i]['amount'];
 		if (!isPositiveInteger(entityAmount)) {
-			message("勾选的第" + (i + 1) + "行数量必须是大于0的整数");
+			message("勾选的第" + (i + 1) + "行实物数量必须是大于0的整数");
+			return;
+		}
+		if (parseFloat(entityAmount) > parseFloat(amount)) {
+			message("第" + (i + 1) + "行实物数量不能大于库存数量");
 			return;
 		}
 	}