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

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

@@ -176,6 +176,8 @@ public class ServiceHGSC005A extends ServiceBase {
 	 * @param dbSc005
 	 */
 	private void checkScheduleData(HGSC005 dbSc005) {
+		AssertUtils.isNotEquals(dbSc005.getCommitStatus(), CommonConstant.YesNo.NO_0,
+				String.format("生产计划已提交，不允许操作"));
 //		AssertUtils.isEquals(hgsc005.getIsSchedule(), CommonConstant.YesNo.YES_1, "当前计划已排产，请手动调整计划！");
 	}
 	

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

@@ -150,6 +150,8 @@ public class ServiceHGSC006A extends ServiceBase {
                 hgsc007.setFactoryCode(factoryCode);
                 hgsc007.setFactoryName(factoryName);
                 DaoUtils.update(HGSC007.UPDATE, hgsc007);
+	            // 写入派工人员明细
+	            HgScUtils.HgSc007B.addGroupUser(hgsc007);
             }
             inInfo.setStatus(EiConstant.STATUS_DEFAULT);
             inInfo.setMsg("操作成功！本次对[" + orderDetailIds.length + "]条数据分派成功!");

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

@@ -318,7 +318,7 @@ let purUserIdChange = function (e) {
 	let userRecordRows = __eiInfo.blocks.user_block_id.rows;
 	for (let k = 0; k < resultGrid.getCheckedRowsIndex() + 1; k++) {
 		for (let i = 0; i < userRecordRows.length; i++) {
-			if (userRecordRows[i][1] === item.supCode) {
+			if (userRecordRows[i][1] === item.purUserId) {
 				let userName = userRecordRows[i][0];
 				resultGrid.setCellValue(item, 'purUserName', userName == null ? "" : userName);
 				return;

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

@@ -160,7 +160,7 @@ $(function () {
 				// change事件
 				grid.dataSource.bind("change", function (e) {
 					supCodeChange(e);
-					supCodeChange(e);
+					purUserIdChange(e);
 					if (e.field == "companyCode") {
 						for (let i = 0; i < companyCodeBox.length; i++) {
 							if (companyCodeBox[i]['companyCode'] === e.items[0]['companyCode']) {
@@ -357,7 +357,7 @@ let purUserIdChange = function (e) {
 	let userRecordRows = __eiInfo.blocks.user_block_id.rows;
 	for (let k = 0; k < resultGrid.getCheckedRowsIndex() + 1; k++) {
 		for (let i = 0; i < userRecordRows.length; i++) {
-			if (userRecordRows[i][1] === item.supCode) {
+			if (userRecordRows[i][1] === item.purUserId) {
 				let userName = userRecordRows[i][0];
 				resultGrid.setCellValue(item, 'purUserName', userName == null ? "" : userName);
 				return;