Merge branch 'dev' of ssh://10.70.33.7:32359/smart/hp-smart into dev

src/main/java/com/baosight/hpjx/hp/sc/domain/HPSC003C.java

+package com.baosight.hpjx.hp.sc.domain;
+
+import com.baosight.iplat4j.core.data.DaoEPBase;
+import com.baosight.iplat4j.core.ei.EiColumn;
+import com.baosight.iplat4j.core.util.NumberUtils;
+import com.baosight.iplat4j.core.util.StringUtils;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HPSC003C implements Serializable {
+
+    private String orgId;
+
+    private BigDecimal untotalWt;
+
+    public String getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+
+    public BigDecimal getUntotalWt() {
+        return untotalWt;
+    }
+
+    public void setUntotalWt(BigDecimal untotalWt) {
+        this.untotalWt = untotalWt;
+    }
+}

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

@@ -228,7 +228,7 @@ let autoProductionschedul = function (planInfoNo) {
                 href: "HPSC003A?methodName=initLoad&inqu_status-0-planInfoNo=" + planInfoNo,
                 title: "<div style='text-align: center;'>自动排产</div>",
                 width: "30%",
-                height: "40%",
+                height: "80%",
                 callbackName: autoProductionschedulCallback
             });
         }

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

@@ -2,6 +2,9 @@ $(function () {
 
     IPLATUI.EFGrid = {
         "result" : {
+            toolbarConfig: {
+                hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
+            },
             pageable: {
                 pageSize: 15,
                 pageSizes: [15, 50, 70, 100],

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

@@ -28,4 +28,9 @@
 			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="80" align="center"/>
 		</EF:EFGrid>
 	</EF:EFRegion>
+	<span style='color: red;font-size: 13px;'>注：只会对未分派的订单进行自动排产！</span>
+	<div class="row">
+		<EF:EFButton ename="cancel"  cname="取消" type="button" class="btn-align-right"/>
+		<EF:EFButton ename="confirm"  cname="确认" type="button" class="btn-align-right"/>
+	</div>
 </EF:EFPage>