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

src/main/java/com/baosight/hpjx/core/enums/DocRouteEnum.java

 package com.baosight.hpjx.core.enums;
 
+
 import com.baosight.hpjx.hp.sc.domain.HPSC002;
 import com.baosight.hpjx.hp.sc.domain.HPSC006;
 import com.baosight.hpjx.hp.sc.domain.HPSC102;
@@ -12,8 +13,12 @@ public enum DocRouteEnum {
 
 	HPSC002("route_001", "", 1, "HPSC002", "importData", HPSC002.class),
 	HPSC006("route_002", "", 1, "HPSC006", "importData", HPSC006.class),
-	HPSC102("route_003", "", 1, "HPSC102", "importData", HPSC102.class),
+	HPSC102("route_003", "",1,"HPSC102", "importData", HPSC102.class)
 	;
+
+	/**
+	 * 唯一标识
+	 */
 	private String id;
 
 	/**

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

@@ -21,7 +21,7 @@ import java.util.Map;
  */
 public class ServiceHPSC106 extends ServiceEPBase {
 
-    @OperationLogAnnotation(operModul = "生产报工单", operType = "查询", operDesc = "初始化页面")
+    @OperationLogAnnotation(operModul = "生产报工", operType = "查询", operDesc = "初始化页面")
     @Override
     public EiInfo initLoad(EiInfo inInfo) {
         try {
@@ -35,7 +35,7 @@ public class ServiceHPSC106 extends ServiceEPBase {
 
     /*
      * 查询*/
-    @OperationLogAnnotation(operModul = "生产报工单", operType = "查询", operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产报工", operType = "查询", operDesc = "查询")
     @Override
     public EiInfo query(EiInfo inInfo) {
         try {
@@ -47,7 +47,7 @@ public class ServiceHPSC106 extends ServiceEPBase {
     }
 
     @Override
-    @OperationLogAnnotation(operModul = "生产报工单", operType = "删除", operDesc = "删除")
+    @OperationLogAnnotation(operModul = "生产报工", operType = "删除", operDesc = "删除")
     public EiInfo delete(EiInfo inInfo) {
         try {
             List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

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

@@ -16,7 +16,7 @@
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
 <c:set var="loginName" value="<%=loginName%>" />
 
-<EF:EFPage  title="生产报工单">
+<EF:EFPage  title="生产报工">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
             <EF:EFInput blockId="inqu_status" row="0" ename="factoryName" cname="工厂区" placeholder="模糊查询" colWidth="3"/>
@@ -37,7 +37,7 @@
             <EF:EFColumn ename="productName" cname="产品名称" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="groupName" cname="生产组" width="100" enable="false" readonly="true" align="center"/>
             <EF:EFColumn ename="quantity" cname="数量" width="100" enable="false" format="{0:0}%" readonly="true" align="center"/>
-            <EF:EFColumn ename="totalWeight" cname="任务总重(KG)" width="100" enable="false" format="{0:n2}" readonly="true" align="center"/>
+            <EF:EFColumn ename="totalWeight" cname="重量" width="100" enable="false" format="{0:n2}" readonly="true" align="center"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>