1.fixBug:全部派工时报错修复

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

@@ -225,7 +225,8 @@ public class ServiceHPSC005A extends ServiceBase {
 				// 更新订单主表数量
 				HPSCTools.checkAssignedNum(dbSc005.getProductionOrderNo(), dbSc005.getNum());
 				// 写入子表数据
-				newSc005a.setProdTaskNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROD_TASK_NO));
+				newSc005a.setProdTaskNo(SequenceGenerator.getNextSequence(HPConstant.SequenceId.PROD_TASK_NO,
+						new String[]{dbSc005.getProductionOrderNo()}));
 				newSc005a.setProdOrderNo(dbSc005.getProductionOrderNo());
 				newSc005a.setNum(dbSc005.getNum());
 				newSc005a.setTotalWt(newSc005a.getNum().multiply(dbSc005.getUnitWt()));

src/main/webapp/HP/SC/HPSC005.js

@@ -18,10 +18,15 @@ $(function () {
 		columns: [{
 			field: "operator",
 			template: function (item) {
+				let status = item.status;
 				let prodOrderNo = item.productionOrderNo;
 				let filePath1 = item.filePath1;
-				let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-					+ 'onclick="tearAssign(\'' + prodOrderNo + '\')"  >拆单派工</a>';
+				let template = '';
+				// 非全部派工时展示拆单派工按钮
+				if (status != 2) {
+					template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+						+ 'onclick="tearAssign(\'' + prodOrderNo + '\')"  >拆单派工</a>';
+				}
 				template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 					+ 'onclick="showGroupDetail(\'' + prodOrderNo + '\')"  >详情</a>';
 				if (filePath1) {
@@ -51,7 +56,7 @@ function tearAssign(prodOrderNo) {
 		href: "HPSC005A?methodName=initLoad&inqu_status-0-prodOrderNo=" + prodOrderNo,
 		title: "<div style='text-align: center;'>拆单派工</div>",
 		width: "80%",
-		height: "80%",
+		height: "90%",
 		callbackName: tearAssignCallback
 	});
 }

src/main/webapp/HP/SC/HPSC005A.js

@@ -7,7 +7,7 @@ $(function () {
 		        pageSizes: [10, 20, 50, 70, 100],
 	        },
 	        columns: [{
-		        field: "factoryName",
+		        field: "orgName",
 		        attributes: {
 			        class: "i-input-readonly"
 		        }

src/main/webapp/HP/SC/HPSC005A.jsp

@@ -37,17 +37,17 @@
 		<EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
 			<EF:EFColumn ename="id" cname="任务ID" enable="false" width="80" align="center"/>
 			<EF:EFColumn ename="prodTaskNo" cname="任务单号" enable="false" hidden="true"/>
-			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" hidden="true"/>
-			<EF:EFPopupColumn ename="factoryName" cname="厂区" width="200" align="center" popupType="ServiceGrid"
-			                  popupTitle="厂区信息" serviceName="HPPZ011" methodName="queryComboBoxAll"
+			<EF:EFColumn ename="orgNo" cname="生产组代码" enable="false" hidden="true"/>
+			<EF:EFPopupColumn ename="orgName" cname="生产组" width="200" align="center" popupType="ServiceGrid"
+			                  popupTitle="生产组信息" serviceName="HPPZ011" methodName="queryComboBoxAll"
 			                  resultId="factory_group_ecord_block_id"
 			                  columnEnames="textField,param2Field"
 			                  columnCnames="厂区,生产组"
 			                  backFillColumnIds="param2Field,param1Field,valueField,textField"
 			                  backFillFieldIds="orgName,orgNo,factoryCode,factoryName"
 			                  valueField="textField" textField="textField" readonly="true" required="true"/>
-			<EF:EFColumn ename="orgNo" cname="生产组代码" enable="false" hidden="true"/>
-			<EF:EFColumn ename="orgName" cname="生产组" enable="false" align="center"/>
+			<EF:EFColumn ename="factoryCode" cname="厂区编码" enable="false" hidden="true"/>
+			<EF:EFColumn ename="factoryName" cname="厂区" enable="false" align="center"/>
 			<EF:EFColumn ename="num" cname="分派数量" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="totalWt" cname="分派重量" enable="false" format="{0:N3}"/>
 			<EF:EFColumn ename="completeNum" cname="已完工数量" enable="false" format="{0:N3}"/>