Merge branch 'dev' of https://gitlab.baocloud.cn/bggf/smart/hp-smart into dev

# Conflicts:
#	src/main/java/com/baosight/hpjx/hp/sc/service/ServiceHPSC006.java
#	src/main/webapp/HP/SC/HPSC006.js
#	src/main/webapp/HP/SC/HPSC006.jsp

src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI001.java

@@ -48,7 +48,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "初始化")
+    @OperationLogAnnotation(operModul = "生产日报",operType = "查询",operDesc = "初始化")
     public EiInfo initLoad(EiInfo inInfo) {
         try {
             Map queryMap = new HashMap();
@@ -68,7 +68,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产日报",operType = "查询",operDesc = "查询")
     @Override
     public EiInfo query(EiInfo inInfo) {
         EiInfo outInfo = new EiInfo();
@@ -114,7 +114,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产日报",operType = "查询",operDesc = "查询CompanyCode")
     public EiInfo queryCompanyCode(EiInfo inInfo) {
         EiInfo outInfo = new EiInfo();
         try {
@@ -137,7 +137,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show14")
     public EiInfo queryZLInfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -194,7 +194,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show17")
     public EiInfo queryXMinfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -260,7 +260,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show21")
     public EiInfo queryRJCLInfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -317,7 +317,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show7")
     public EiInfo queryYCLInfo(EiInfo inInfo) {
         EiInfo eiInfo = new EiInfo();
         String serviceId = "S_BE_XP_17";
@@ -374,7 +374,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show6")
     public EiInfo queryHAPlanInfo(EiInfo inInfo) {
         String paramsStr = inInfo.getString(PARAMS_KEY_STR);
         JSONArray jsonArray = (JSONArray) JSONArray.parse(paramsStr);
@@ -440,7 +440,7 @@ public class ServiceHPBI001 extends ServiceBase {
      * @param inInfo
      * @return
      */
-    @OperationLogAnnotation(operModul = "报表管理",operType = "查询",operDesc = "测试")
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "查询报屏模块show9")
     public EiInfo queryMonWtInfo(EiInfo inInfo) {
         String paramsStr = inInfo.getString(PARAMS_KEY_STR);
         JSONArray jsonArray = (JSONArray) JSONArray.parse(paramsStr);
@@ -501,6 +501,7 @@ public class ServiceHPBI001 extends ServiceBase {
      *
      * @return
      */
+    @OperationLogAnnotation(operModul = "生产管理驾驶舱",operType = "查询",operDesc = "微服务测试方法（柱形图、折线图、饼图）")
     public EiInfo queryMicroServiceBarData(EiInfo eiInfo) {
         EiInfo returnInfo = new EiInfo();
         String paramsStr = eiInfo.getString(PARAMS_KEY_STR);

src/main/java/com/baosight/hpjx/hp/bi/sql/HPBI001.xml

@@ -39,7 +39,7 @@
         WHERE A.DELETE_FLAG = 0
         GROUP BY A.FACTORY_CODE
         ) B ON A.FACTORY_CODE=B.FACTORY_CODE
-        JOIN hpjx.t_hpkc003 C ON A.PRODUCTION_ORDER_NO = C.PROD_ORDER_NO
+        JOIN hpjx.t_hpkc003 C ON A.PROD_ORDER_NO = C.PROD_ORDER_NO
         WHERE  ifnull(C.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="date">
             C.DOCUMENT_DATE = replace(#date#,'-','')
@@ -75,7 +75,7 @@
         WHERE A.DELETE_FLAG = 0
         GROUP BY A.FACTORY_CODE
         ) B ON A.FACTORY_CODE=B.FACTORY_CODE
-        JOIN hpjx.t_hpkc003 C ON A.PRODUCTION_ORDER_NO = C.PROD_ORDER_NO
+        JOIN hpjx.t_hpkc003 C ON A.PROD_ORDER_NO = C.PROD_ORDER_NO
         WHERE  ifnull(C.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="date">
             C.DOCUMENT_DATE = replace(#date#,'-','')
@@ -116,7 +116,7 @@
         WHERE A.DELETE_FLAG = 0
         GROUP BY A.FACTORY_CODE
         ) B ON A.FACTORY_CODE=B.FACTORY_CODE
-        JOIN hpjx.t_hpkc003 C ON A.PRODUCTION_ORDER_NO = C.PROD_ORDER_NO
+        JOIN hpjx.t_hpkc003 C ON A.PROD_ORDER_NO = C.PROD_ORDER_NO
         WHERE  ifnull(C.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="date">
             C.DOCUMENT_DATE = replace(#date#,'-','')
@@ -157,7 +157,7 @@
         WHERE A.DELETE_FLAG = 0
         GROUP BY A.FACTORY_CODE
         ) B ON A.FACTORY_CODE=B.FACTORY_CODE
-        JOIN hpjx.t_hpkc003 C ON A.PRODUCTION_ORDER_NO = C.PROD_ORDER_NO
+        JOIN hpjx.t_hpkc003 C ON A.PROD_ORDER_NO = C.PROD_ORDER_NO
         WHERE  ifnull(C.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="date">
             C.DOCUMENT_DATE = replace(#date#,'-','')
@@ -199,7 +199,7 @@
         WHERE A.DELETE_FLAG = 0
         GROUP BY A.FACTORY_CODE
         ) B ON A.FACTORY_CODE=B.FACTORY_CODE
-        JOIN hpjx.t_hpkc003 C ON A.PRODUCTION_ORDER_NO = C.PROD_ORDER_NO
+        JOIN hpjx.t_hpkc003 C ON A.PROD_ORDER_NO = C.PROD_ORDER_NO
         WHERE  ifnull(C.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="date">
             C.DOCUMENT_DATE = replace(#date#,'-','')
@@ -227,7 +227,7 @@
         NUM as VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VAULE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -257,7 +257,7 @@
         NUM as VALUE
         FROM (select FACTORY_CODE,sum(ifnull(WEIGHT,0)) as VAULE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -288,7 +288,7 @@
         NUM as VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VAULE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -329,7 +329,7 @@
         MAX(case when substring(DOCUMENT_DATE,5,2) = '12' THEN NUM ELSE 0 END) as decValue
         FROM  (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VAULE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -365,7 +365,7 @@
         VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -395,7 +395,7 @@
         VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -426,7 +426,7 @@
         VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -467,7 +467,7 @@
         MAX(case when substring(DOCUMENT_DATE,5,2) = '12' THEN VALUE ELSE 0 END) as decValue
         FROM  (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -503,7 +503,7 @@
         VALUE/NUM AS VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -533,7 +533,7 @@
         VALUE/NUM AS VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -564,7 +564,7 @@
         VALUE/NUM AS VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -605,7 +605,7 @@
         MAX(case when substring(DOCUMENT_DATE,5,2) = '12' THEN VALUE/NUM ELSE 0 END) as decValue
         FROM  (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VALUE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -652,7 +652,7 @@
         VAULE as VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VAULE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -690,7 +690,7 @@
         NUM as VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VAULE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#
@@ -728,7 +728,7 @@
         VAULE/NUM as VALUE
         FROM (select FACTORY_CODE,DOCUMENT_DATE,sum(ifnull(WEIGHT,0)) as VAULE
         FROM hpjx.t_hpkc003 A
-        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PRODUCTION_ORDER_NO
+        JOIN hpjx.t_hpsc005 B ON A.PROD_ORDER_NO = B.PROD_ORDER_NO
         where ifnull(A.DOCUMENT_DATE,'')  <![CDATA[<>]]> ''
         <isNotEmpty prepend=" AND " property="pro_code">
             A.PROJ_CODE = #pro_code#

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC002A.java

@@ -46,7 +46,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "生产领料单-库存查询-初始化")
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
@@ -69,7 +69,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "生产领料单-库存查询-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -88,7 +88,7 @@ public class ServiceHPKC002A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成出库单")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生产领料单-库存查询-生成出库单")
 	public EiInfo select(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC003A.java

@@ -70,7 +70,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "生产入库单-生产任务查询-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -89,7 +89,7 @@ public class ServiceHPKC003A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "生产任务查询",operType = "插入",operDesc = "生成入库单")
+	@OperationLogAnnotation(operModul = "生产任务查询",operType = "插入",operDesc = "生产入库单-生产任务查询-生成入库单")
 	public EiInfo select(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC004A.java

@@ -43,7 +43,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "销售出库单-库存查询-初始化")
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
@@ -60,7 +60,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "销售出库单-库存查询-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -77,7 +77,7 @@ public class ServiceHPKC004A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成出库单")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "销售出库单-库存查询-生成出库单")
 	public EiInfo select(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC005A.java

@@ -60,7 +60,7 @@ public class ServiceHPKC005A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "库存盘点单-库存查询-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -78,7 +78,7 @@ public class ServiceHPKC005A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成盘点单")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "库存盘点单-库存查询-生成盘点单")
 	public EiInfo select(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC007A.java

@@ -45,7 +45,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "其他出库单-库存查询-初始化")
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
@@ -68,7 +68,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "查询",operDesc = "其他出库单-库存查询-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -87,7 +87,7 @@ public class ServiceHPKC007A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "生成出库单")
+	@OperationLogAnnotation(operModul = "库存查询",operType = "插入",operDesc = "其他出库单-库存查询-生成出库单")
 	public EiInfo select(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC010A.java

@@ -24,7 +24,7 @@ public class ServiceHPKC010A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "备份数据")
+	@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "实时库存管理-备份数据")
 	public EiInfo backup(EiInfo inInfo) {
 		try {
 			Map queryMap = new HashMap();

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC011A.java

@@ -24,7 +24,7 @@ public class ServiceHPKC011A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "备份数据")
+	@OperationLogAnnotation(operModul = "库存管理",operType = "插入",operDesc = "产品库存管理-备份数据")
 	public EiInfo backup(EiInfo inInfo) {
 		try {
 			Map queryMap = new HashMap();

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ006.java

@@ -37,7 +37,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null,false);
@@ -52,7 +52,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	/**
 	 * 查询操作.
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -69,7 +69,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "新增 ",operDesc = "新增")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "新增",operDesc = "新增")
 	@Override
 	public EiInfo insert(EiInfo inInfo) {
 		try {
@@ -99,7 +99,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 *
 	 * @param resultRows
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "校验 ",operDesc = "校验保存的数据")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "校验",operDesc = "校验保存的数据")
 	private void checkSaveData(List<Map> resultRows) {
 		for (int i = 0; i < resultRows.size(); i++) {
 			HPPZ006 fPz006 = new HPPZ006();
@@ -124,7 +124,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "修改 ",operDesc = "修改")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "修改",operDesc = "修改")
 	public EiInfo update(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -151,7 +151,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "删除 ",operDesc = "删除")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "删除",operDesc = "删除")
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -173,7 +173,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "判断存货档案是否存在，如果存在返回ID，否则新增并返回ID")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "判断存货档案是否存在，如果存在返回ID，否则新增并返回ID")
 	public EiInfo checkAndSave(EiInfo inInfo){
 		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_INVENT_TYPE,inInfo.getString("inventType"));
 		inInfo.setCell(EiConstant.queryBlock,0,HPPZ006.FIELD_INVENT_CODE,inInfo.getString("inventCode"));
@@ -215,7 +215,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "规格下拉框")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "规格下拉框")
 	public EiInfo queryComboBoxSpec(EiInfo inInfo) {
 		try {
 			List<DdynamicEnum> list = new ArrayList<>();
@@ -233,7 +233,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param eiInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "存货名称下拉框")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "存货名称下拉框")
 	public EiInfo queryMaterialComboBox(EiInfo eiInfo) {
 		Map map = EiInfoUtils.getFirstRow(eiInfo);
 		if (ObjectUtils.isEmpty(map.get("inventType"))) {
@@ -255,7 +255,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "下拉框")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "下拉框")
 	public EiInfo queryComboBoxAll(EiInfo inInfo) {
 		try {
 			List<DdynamicEnum> list = new ArrayList<>();
@@ -273,7 +273,7 @@ public class ServiceHPPZ006 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "存货档案",operType = "查询 ",operDesc = "单位下拉框")
+	@OperationLogAnnotation(operModul = "存货档案",operType = "查询",operDesc = "单位下拉框")
 	public EiInfo queryComboBoxUnit(EiInfo inInfo) {
 		try {
 			List<DdynamicEnum> list = new ArrayList<>();

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java

@@ -32,7 +32,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询 ",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.USER_BLOCK_ID), null,true);
@@ -49,7 +49,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询 ",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询",operDesc = "查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -63,7 +63,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	/**
 	 * 新增操作.
 	 */
-	@OperationLogAnnotation(operModul = "仓库档案",operType = "新增 ",operDesc = "新增")
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "新增",operDesc = "新增")
 	@Override
 	public EiInfo insert(EiInfo inInfo) {
 		try {
@@ -91,7 +91,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "仓库档案",operType = "修改 ",operDesc = "修改")
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "修改",operDesc = "修改")
 	public EiInfo update(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -115,7 +115,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "仓库档案",operType = "删除 ",operDesc = "删除")
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "删除",operDesc = "删除")
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
@@ -137,7 +137,7 @@ public class ServiceHPPZ007 extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询 ",operDesc = "根据仓库CODE找对象")
+	@OperationLogAnnotation(operModul = "仓库档案",operType = "查询",operDesc = "根据仓库CODE找对象")
 	public EiInfo queryByWhCode(EiInfo inInfo) {
 		Map params = new HashMap<>();
 		params.put("whCode", inInfo.getString("whCode"));

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ008.java

@@ -23,7 +23,7 @@ public class ServiceHPPZ008 extends ServiceBase {
     /**
      * 画面初始化.
      */
-    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "查询 ",operDesc = "初始化")
+    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "查询",operDesc = "初始化")
     public EiInfo initLoad(EiInfo inInfo) {
         Thppz008 hppz008 = new Thppz008();
         EiInfo outInfo = super.initLoad(inInfo, hppz008);
@@ -35,7 +35,7 @@ public class ServiceHPPZ008 extends ServiceBase {
     /**
      * 查询操作.
      */
-    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "查询 ",operDesc = "查询")
+    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "查询",operDesc = "查询")
     @Override
     public EiInfo query(EiInfo inInfo) {
         /* 调用EI查询方法.*/
@@ -47,7 +47,7 @@ public class ServiceHPPZ008 extends ServiceBase {
     /**
      * 新增操作.
      */
-    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "新增 ",operDesc = "新增")
+    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "新增",operDesc = "新增")
     @Override
     public EiInfo insert(EiInfo inInfo) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -83,7 +83,7 @@ public class ServiceHPPZ008 extends ServiceBase {
     /**
      * 修改操作.
      */
-    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "修改 ",operDesc = "修改")
+    @OperationLogAnnotation(operModul = "库存预警值档案",operType = "修改",operDesc = "修改")
     public EiInfo update(EiInfo inInfo) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {

src/main/java/com/baosight/hpjx/hp/rz/service/ServiceHPRZ001.java

@@ -56,6 +56,7 @@ public class ServiceHPRZ001 extends ServiceBase {
     @Override
     public EiInfo query(EiInfo inInfo) {
         try {
+            inInfo.setCell(EiConstant.queryBlock, 0, "companyCode",UserSessionUtils.getCompanyCode());
             inInfo = super.query(inInfo, HPRZ001.QUERY, new HPRZ001());
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "查询失败");

src/main/java/com/baosight/hpjx/hp/rz/sql/HPRZ001.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
+	<!--      table information
+		Generate time : 2024-02-23 15:28:50
+   		Version :  1.0
+		tableName :hpjx.sys_operation_log 
+		 ID  BIGINT   NOT NULL   primarykey, 
+		 COMPANY_CODE  VARCHAR   NOT NULL, 
+		 CREATED_BY  VARCHAR, 
+		 CREATED_NAME  VARCHAR, 
+		 CREATED_TIME  VARCHAR, 
+		 OPER_MODUL  VARCHAR, 
+		 OPER_TYPE  VARCHAR, 
+		 OPER_DESC  VARCHAR, 
+		 OPER_CONTENT  VARCHAR
+	-->
+<sqlMap namespace="HPRZ001">
+
+	<select id="query" parameterClass="java.util.HashMap" 
+			resultClass="com.baosight.hpjx.hp.rz.domian.HPRZ001">
+		SELECT
+				ID	as "id",  <!-- 主键id -->
+				COMPANY_CODE	as "companyCode",  <!-- 企业编码 -->
+				CREATED_BY	as "createdBy",  <!-- 创建人 -->
+				CREATED_NAME	as "createdName",  <!-- 创建人名称 -->
+				CREATED_TIME	as "createdTime",  <!-- 创建时间 -->
+				OPER_MODUL	as "operModul",  <!-- 操作模块 -->
+				OPER_TYPE	as "operType",  <!-- 操作类型 -->
+				OPER_DESC	as "operDesc",  <!-- 操作说明 -->
+				OPER_CONTENT	as "operContent" <!-- 操作内容 -->
+		FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateFrom">
+			CREATED_TIME >= replace(replace(replace(#createdDateFrom#,'-',''),' ',''),':','')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateTo">
+			CREATED_TIME <![CDATA[<=]]> replace(replace(replace(#createdDateTo#,'-',''),' ',''),':','')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operModul">
+			OPER_MODUL = #operModul#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operType">
+			OPER_TYPE = #operType#
+		</isNotEmpty>
+		<dynamic prepend="ORDER BY">
+         <isNotEmpty property="orderBy">
+    		  $orderBy$
+   		 </isNotEmpty>
+   		<isEmpty property="orderBy">
+    		  ID asc
+		</isEmpty>
+  		</dynamic>
+			
+	</select>
+
+	<select id="count" resultClass="int">
+		SELECT COUNT(*) FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME LIKE CONCAT('%',CONCAT( #createdName#,'%'))
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateFrom">
+			CREATED_TIME >= replace(replace(replace(#createdDateFrom#,'-',''),' ',''),':','')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdDateTo">
+			CREATED_TIME <![CDATA[<=]]> replace(replace(replace(#createdDateTo#,'-',''),' ',''),':','')
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operModul">
+			OPER_MODUL = #operModul#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operType">
+			OPER_TYPE = #operType#
+		</isNotEmpty>
+	</select>
+	
+	<!--  
+		<isNotEmpty prepend=" AND " property="id">
+			ID = #id#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdBy">
+			CREATED_BY = #createdBy#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdName">
+			CREATED_NAME = #createdName#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="createdTime">
+			CREATED_TIME = #createdTime#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operModul">
+			OPER_MODUL = #operModul#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operType">
+			OPER_TYPE = #operType#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operDesc">
+			OPER_DESC = #operDesc#
+		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="operContent">
+			OPER_CONTENT = #operContent#
+		</isNotEmpty>
+	-->
+
+	<insert id="insert">
+		INSERT INTO hpjx.sys_operation_log (ID,  <!-- 主键id -->
+										COMPANY_CODE,  <!-- 企业编码 -->
+										CREATED_BY,  <!-- 创建人 -->
+										CREATED_NAME,  <!-- 创建人名称 -->
+										CREATED_TIME,  <!-- 创建时间 -->
+										OPER_MODUL,  <!-- 操作模块 -->
+										OPER_TYPE,  <!-- 操作类型 -->
+										OPER_DESC,  <!-- 操作说明 -->
+										OPER_CONTENT  <!-- 操作内容 -->
+										)		 
+	    VALUES (#id#, #companyCode#, #createdBy#, #createdName#, #createdTime#, #operModul#, #operType#, #operDesc#, #operContent#) 
+	</insert>
+  
+	<delete id="delete">
+		DELETE FROM hpjx.sys_operation_log WHERE 
+			ID = #id#
+	</delete>
+
+	<update id="update">
+		UPDATE hpjx.sys_operation_log 
+		SET 
+					COMPANY_CODE	= #companyCode#,   <!-- 企业编码 -->  
+					CREATED_BY	= #createdBy#,   <!-- 创建人 -->  
+					CREATED_NAME	= #createdName#,   <!-- 创建人名称 -->  
+					CREATED_TIME	= #createdTime#,   <!-- 创建时间 -->  
+					OPER_MODUL	= #operModul#,   <!-- 操作模块 -->  
+					OPER_TYPE	= #operType#,   <!-- 操作类型 -->  
+					OPER_DESC	= #operDesc#,   <!-- 操作说明 -->  
+					OPER_CONTENT	= #operContent#  <!-- 操作内容 -->  
+			WHERE 	
+			ID = #id#
+	</update>
+
+	<!-- 查询操作模块 -->
+	<select id="queryOperModulComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+		distinct OPER_MODUL	as "operModul"  <!-- 操作模块 -->
+		FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+	</select>
+
+	<!-- 查询操作类型 -->
+	<select id="queryOperTypeComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
+		SELECT
+		distinct OPER_TYPE	as "operType"  <!-- 操作类型 -->
+		FROM hpjx.sys_operation_log WHERE 1=1
+		<isNotEmpty prepend=" AND " property="companyCode">
+			COMPANY_CODE = #companyCode#
+		</isNotEmpty>
+	</select>
+  
+</sqlMap>
\ No newline at end of file

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

@@ -27,14 +27,14 @@ public class HPSC005B extends HPSC005 {
 	public static final String FIELD_PROD_TASK_NO = "prodTaskNo";
 	public static final String FIELD_PROD_ORDER_NO = "prodOrderNo";
 	public static final String FIELD_COMPLETE_NUM = "completeNum";    		/* 已完成数量*/
-
+	public static final String FIELD_UN_COMPLETE_NUM = "unCompleteNum";    		/* 剩余数量*/
 	public static final String FIELD_ZL_PROD_TASK_NO = "zlprodTaskNo";    		/* 质检单任务号*/
 
 	public static final String COL_CHILD_ID = "CHILD_ID";
 	public static final String COL_PROD_TASK_NO = "PROD_TASK_NO";
 	public static final String COL_PROD_ORDER_NO = "PROD_ORDER_NO";
 	public static final String COL_COMPLETE_NUM = "COMPLETE_NUM";    		/* 已完成数量*/
-
+	public static final String COL_UN_COMPLETE_NUM = "UN_COMPLETE_NUM";    		/* 剩余数量*/
 	public static final String COL_ZL_PROD_TASK_NO = "ZL_PROD_TASK_NO";    		/* 质检单任务号*/
 
 	public static final String QUERY = "HPSC005B.query";
@@ -47,8 +47,9 @@ public class HPSC005B extends HPSC005 {
 	private String prodTaskNo = " ";
 	private String prodOrderNo = " ";
 	private BigDecimal completeNum = new BigDecimal(0.000);		/* 已完成数量*/
-
+	private BigDecimal unCompleteNum = new BigDecimal(0.000);		/* 剩余数量*/
 	private String zlprodTaskNo = " ";
+	
 	/**
 	 * the constructor.
 	 */
@@ -82,6 +83,13 @@ public class HPSC005B extends HPSC005 {
 		eiColumn.setDescName("已完成数量");
 		eiMetadata.addMeta(eiColumn);
 		
+		eiColumn = new EiColumn(FIELD_UN_COMPLETE_NUM);
+		eiColumn.setType("N");
+		eiColumn.setScaleLength(3);
+		eiColumn.setFieldLength(15);
+		eiColumn.setDescName("剩余数量");
+		eiMetadata.addMeta(eiColumn);
+		
 		eiColumn = new EiColumn(FIELD_ZL_PROD_TASK_NO);
 		eiColumn.setDescName("质检单任务号");
 		eiMetadata.addMeta(eiColumn);
@@ -138,6 +146,14 @@ public class HPSC005B extends HPSC005 {
 		this.completeNum = completeNum;
 	}
 	
+	public BigDecimal getUnCompleteNum() {
+		return unCompleteNum;
+	}
+	
+	public void setUnCompleteNum(BigDecimal unCompleteNum) {
+		this.unCompleteNum = unCompleteNum;
+	}
+	
 	public String getZlProdTaskNo() {
 		return zlprodTaskNo;
 	}
@@ -157,6 +173,7 @@ public class HPSC005B extends HPSC005 {
 		setProdTaskNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_TASK_NO)), prodTaskNo));
 		setProdOrderNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_PROD_ORDER_NO)), prodOrderNo));
 		setCompleteNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_COMPLETE_NUM)), completeNum));
+		setUnCompleteNum(NumberUtils.toBigDecimal(StringUtils.toString(map.get(FIELD_UN_COMPLETE_NUM)), unCompleteNum));
 		setZlProdTaskNo(StringUtils.defaultIfEmpty(StringUtils.toString(map.get(FIELD_ZL_PROD_TASK_NO)), zlprodTaskNo));
 	}
 	
@@ -171,6 +188,7 @@ public class HPSC005B extends HPSC005 {
 		map.put(FIELD_PROD_TASK_NO, StringUtils.toString(prodTaskNo, eiMetadata.getMeta(FIELD_PROD_TASK_NO)));
 		map.put(FIELD_PROD_ORDER_NO, StringUtils.toString(prodOrderNo, eiMetadata.getMeta(FIELD_PROD_ORDER_NO)));
 		map.put(FIELD_COMPLETE_NUM, StringUtils.toString(completeNum, eiMetadata.getMeta(FIELD_COMPLETE_NUM)));
+		map.put(FIELD_UN_COMPLETE_NUM, StringUtils.toString(unCompleteNum, eiMetadata.getMeta(FIELD_UN_COMPLETE_NUM)));
 		map.put(FIELD_ZL_PROD_TASK_NO, StringUtils.toString(zlprodTaskNo, eiMetadata.getMeta(FIELD_ZL_PROD_TASK_NO)));
 		return map;
 	}

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

@@ -39,7 +39,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "物料清单-附件清单A-初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			// 查询物料ID所对应的项目名称和部件名称
@@ -78,7 +78,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "物料清单-附件清单A-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -95,7 +95,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "新增操作")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "物料清单-附件清单A-新增操作")
 	@Override
 	public EiInfo insert(EiInfo inInfo) {
 		try {
@@ -119,7 +119,7 @@ public class ServiceHPSC002A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "删除操作")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "物料清单-附件清单A-删除操作")
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

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

@@ -28,7 +28,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "物料清单-附件清单B-初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			// 查询物料ID所对应的项目名称和部件名称
@@ -53,7 +53,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "物料清单-附件清单B-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -70,7 +70,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "新增")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "物料清单-附件清单B-新增")
 	@Override
 	public EiInfo insert(EiInfo inInfo) {
 		try {
@@ -94,7 +94,7 @@ public class ServiceHPSC002B extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "删除")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "物料清单-附件清单B-删除")
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

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

@@ -42,7 +42,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "生产订单-拆单派工A-初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
@@ -63,7 +63,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "生产订单-拆单派工A-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -80,7 +80,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "新增操作")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "生产订单-拆单派工A-新增操作")
 	public EiInfo save(EiInfo inInfo) {
 		try {
 			Map detailMap = EiInfoUtils.getFirstRow(inInfo, CommonConstant.Field.DETAIL);
@@ -123,7 +123,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param dbSc005
 	 * @param fSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "新增")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "生产订单-拆单派工A-新增")
 	private void add(HPSC005 dbSc005, HPSC005A fSc005a) {
 		String prodOrderNo = dbSc005.getProdOrderNo();
 		// 数据校验
@@ -148,7 +148,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param fSc005a
 	 * @param mapSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "修改",operDesc = "修改数据")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "修改",operDesc = "生产订单-拆单派工A-修改数据")
 	private void modify(HPSC005 dbSc005, HPSC005A fSc005a, Map<String, HPSC005A> mapSc005a) {
 		String prodOrderNo = dbSc005.getProdOrderNo();
 		// 数据校验
@@ -170,7 +170,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "删除",operDesc = "删除操作")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "删除",operDesc = "生产订单-拆单派工A-删除操作")
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			Map detailMap = EiInfoUtils.getFirstRow(inInfo, CommonConstant.Field.DETAIL);
@@ -204,7 +204,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "刷新",operDesc = "刷新主订单信息")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "刷新",operDesc = "生产订单-拆单派工A-刷新主订单信息")
 	private EiInfo refreshOrderInfo(EiInfo inInfo, String prodOrderNo) {
 		HPSC005 dbSc005 = HPSCTools.HpSc005.get(prodOrderNo);
 		inInfo.addBlock(CommonConstant.Field.DETAIL).addRow(dbSc005);
@@ -217,7 +217,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "分派")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "新增",operDesc = "生产订单-拆单派工A-分派")
 	public EiInfo assign(EiInfo inInfo) {
 		try {
 			List<String> orderIds = (List<String>) inInfo.get("ids");
@@ -266,7 +266,7 @@ public class ServiceHPSC005A extends ServiceBase {
 	 *
 	 * @param fSc005a
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "设置",operDesc = "设置基础信息")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "设置",operDesc = "生产订单-拆单派工A-设置基础信息")
 	private void setBaseInfo(HPSC005A fSc005a) {
 		// 厂区名称
 		fSc005a.setFactoryName(HPPZTools.HpPz011.getFactoryName(fSc005a.getFactoryCode()));

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

 package com.baosight.hpjx.hp.sc.service;
 
+import com.baosight.hpjx.common.DdynamicEnum;
 import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hpjx.hp.sc.domain.HPSC005B;
+import com.baosight.hpjx.util.CommonMethod;
 import com.baosight.hpjx.util.LogUtils;
 import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 
+import java.util.Arrays;
+
 /**
  * 生产任务
  *
@@ -24,6 +28,8 @@ public class ServiceHPSC005B extends ServiceBase {
 	@OperationLogAnnotation(operModul = "生产任务",operType = "查询",operDesc = "初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
+			CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID), null, false);
 			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPSC005B().eiMetadata);
 		} catch (Exception e) {
 			LogUtils.setMsg(inInfo, e, "初始化失败");

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

@@ -36,7 +36,7 @@ public class ServiceHPSC005C extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "生产订单-拆单派工C-初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
@@ -57,7 +57,7 @@ public class ServiceHPSC005C extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "拆单派工",operType = "查询",operDesc = "生产订单-拆单派工C-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {

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

+package com.baosight.hpjx.hp.sc.service;
+
+import com.baosight.hpjx.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hpjx.hp.sc.domain.HPSC005A;
+import com.baosight.hpjx.hp.sc.domain.HPSC005B;
+import com.baosight.hpjx.hp.sc.tools.HPSCTools;
+import com.baosight.hpjx.util.EiInfoUtils;
+import com.baosight.hpjx.util.LogUtils;
+import com.baosight.hpjx.util.MapUtils;
+import com.baosight.iplat4j.core.ei.EiBlock;
+import com.baosight.iplat4j.core.ei.EiConstant;
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+
+import java.util.Map;
+
+/**
+ * @author:songx
+ * @date:2024/2/6,10:39
+ */
+public class ServiceHPSC005D extends ServiceBase {
+	
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@OperationLogAnnotation(operModul = "生产任务详情",operType = "查询",operDesc = "生产订单-生产任务详情-初始化")
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
+			String prodTaskNo = MapUtils.getString(queryMap, "prodTaskNo");
+			HPSC005B dbSc005b = HPSCTools.HpSc005b.get(prodTaskNo);
+			EiBlock resultBlock = inInfo.addBlock(EiConstant.resultBlock);
+			resultBlock.addRow(dbSc005b);
+			resultBlock.addBlockMeta(new HPSC005B().eiMetadata);
+		} catch (Exception e) {
+			LogUtils.setMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+	
+}
+
+

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

@@ -44,6 +44,8 @@ public class ServiceHPSC006 extends ServiceBase {
             HPSC005 HPSC005 = new HPSC005();
             EiInfo outInfo = super.initLoad(inInfo, HPSC005);
             outInfo.addBlock(EiConstant.resultBlock).addBlockMeta(HPSC005.eiMetadata);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null, false);
+            CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
         } catch (Exception e) {
             LogUtils.setDetailMsg(inInfo, e, "初始化失败");
         }
@@ -77,6 +79,8 @@ public class ServiceHPSC006 extends ServiceBase {
         outInfo.addBlock("detail").addBlockMeta(HPSC006.eiMetadata);
         outInfo.addBlock("detail").addRows(list);
         outInfo.getBlock("detail").set("limit", list.size());
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.INVENT_NAME_BLOCK_ID), null, false);
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), null, false);
         return outInfo;
     }
 
@@ -107,6 +111,7 @@ public class ServiceHPSC006 extends ServiceBase {
                 HPSC006.setStatus(CommonConstant.YesNo.NO_0.intValue());
                 HPSC006.setTotalWt(totalWt);
                 HPSC006.setInventCode(HPPZTools.checkAndSavePZ04(HPSC006.getInventType(),HPSC006.getInventName()));
+                HPSC006.setStatus(1);
                 DaoUtils.insert("HPSC006.insert",HPSC006);
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC005B.xml

@@ -28,7 +28,8 @@
         B.PROD_ORDER_NO as "prodOrderNo",
         B.NUM as "num",
         B.TOTAL_WT as "totalWt",
-        B.COMPLETE_NUM as "completeNum",
+        B.COMPLETE_NUM as "completeNum",  <!-- 完成数量 -->
+        (B.NUM - B.COMPLETE_NUM) as "unCompleteNum",  <!-- 剩余数量 -->
         B.FACTORY_CODE as "factoryCode",  <!-- 厂区编码 -->
         B.FACTORY_NAME as "factoryName",  <!-- 厂区名称 -->
         B.ORG_NO as "orgNo",
@@ -68,14 +69,17 @@
             B.ID = #childId#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="prodTaskNo">
-            B.PROD_TASK_NO = #prodTaskNo#
+            B.PROD_TASK_NO LIKE CONCAT('%', #prodTaskNo#, '%')
         </isNotEmpty>
-        <isNotEmpty prepend=" AND " property="prodOrderNo">
-            B.PROD_ORDER_NO = #prodOrderNo#
+        <isNotEmpty prepend=" AND " property="factoryCode">
+            B.FACTORY_CODE = #factoryCode#
         </isNotEmpty>
         <isNotEmpty prepend=" AND " property="factoryName">
             B.FACTORY_NAME LIKE CONCAT('%', #factoryName#, '%')
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="orgNo">
+            B.ORG_NO = #orgNo#
+        </isNotEmpty>
         <isNotEmpty prepend=" AND " property="orgName">
             B.ORG_NAME LIKE CONCAT('%', #orgName#, '%')
         </isNotEmpty>

src/main/java/com/baosight/hpjx/hp/sc/tools/HPSCTools.java

@@ -585,6 +585,21 @@ public class HPSCTools {
 		/**
 		 * 查询信息
 		 *
+		 * @param prodTaskNo
+		 * @return
+		 */
+		public static HPSC005A get(String prodTaskNo) {
+			AssertUtils.isEmpty(prodTaskNo, "生产任务号不能为空");
+			Map queryMap = new HashMap();
+			queryMap.put("prodTaskNo", prodTaskNo);
+			List<HPSC005A> results = DaoBase.getInstance().query(HPSC005A.QUERY, queryMap);
+			AssertUtils.isEmpty(results, String.format("生产任务[%s]信息不存在", prodTaskNo));
+			return results.get(0);
+		}
+		
+		/**
+		 * 查询信息
+		 *
 		 * @param prodTaskNos
 		 * @return
 		 */
@@ -622,6 +637,21 @@ public class HPSCTools {
 	public static class HpSc005b {
 		
 		/**
+		 * 查询信息
+		 *
+		 * @param prodTaskNo
+		 * @return
+		 */
+		public static HPSC005B get(String prodTaskNo) {
+			AssertUtils.isEmpty(prodTaskNo, "生产任务号不能为空");
+			Map queryMap = new HashMap();
+			queryMap.put("prodTaskNo", prodTaskNo);
+			List<HPSC005B> results = DaoBase.getInstance().query(HPSC005B.QUERY, queryMap);
+			AssertUtils.isEmpty(results, String.format("生产任务[%s]信息不存在", prodTaskNo));
+			return results.get(0);
+		}
+		
+		/**
 		 * 查询盘点单信息
 		 *
 		 * @param prodTaskNos

src/main/java/com/baosight/hpjx/hp/xs/service/ServiceHPXSUser.java

@@ -29,7 +29,6 @@ public class ServiceHPXSUser extends ServiceBase {
 	 * @param eiInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "用户信息",operType = "查询",operDesc = "获取用户信息")
 	public EiInfo getUser(EiInfo eiInfo) {
 		EiInfo outInfo = new EiInfo();
 		int status = 0;
@@ -64,7 +63,6 @@ public class ServiceHPXSUser extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "用户信息",operType = "查询",operDesc = "查询用户下拉框")
 	public EiInfo queryComboBox(EiInfo inInfo) {
 		try {
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);
@@ -84,7 +82,6 @@ public class ServiceHPXSUser extends ServiceBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "用户信息",operType = "查询",operDesc = "查询用户的企业下拉框")
 	public EiInfo queryCompanyComboBox(EiInfo inInfo) {
 		try {
 			Map queryMap = EiInfoUtils.getFirstRow(inInfo);

src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001A.java

@@ -32,7 +32,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "质量巡检单-附件清单-初始化")
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
 			// 查询物料ID所对应的项目名称和部件名称
@@ -55,7 +55,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "查询",operDesc = "质量巡检单-附件清单-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -72,7 +72,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "新增操作")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "新增",operDesc = "质量巡检单-附件清单-新增操作")
 	@Override
 	public EiInfo insert(EiInfo inInfo) {
 		try {
@@ -100,7 +100,7 @@ public class ServiceHPZL001A extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "删除操作")
+	@OperationLogAnnotation(operModul = "附件清单",operType = "删除",operDesc = "质量巡检单-附件清单-删除操作")
 	public EiInfo delete(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/java/com/baosight/hpjx/hp/zl/service/ServiceHPZL001B.java

@@ -44,7 +44,7 @@ public class ServiceHPZL001B extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "初始化")
+	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "质量巡检单-生产任务查询-初始化")
 	@Override
 	public EiInfo initLoad(EiInfo inInfo) {
 		try {
@@ -61,7 +61,7 @@ public class ServiceHPZL001B extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "查询")
+	@OperationLogAnnotation(operModul = "生产任务查询",operType = "查询",operDesc = "质量巡检单-生产任务查询-查询")
 	@Override
 	public EiInfo query(EiInfo inInfo) {
 		try {
@@ -81,7 +81,7 @@ public class ServiceHPZL001B extends ServiceEPBase {
 	 * @param inInfo
 	 * @return
 	 */
-	@OperationLogAnnotation(operModul = "生产任务查询",operType = "新增",operDesc = "生成巡检单")
+	@OperationLogAnnotation(operModul = "生产任务查询",operType = "新增",operDesc = "质量巡检单-生产任务查询-生成巡检单")
 	public EiInfo select(EiInfo inInfo) {
 		try {
 			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();

src/main/webapp/HP/RZ/HPRZ001.js

-let whNameGlobalData = [];
-let inventNameGlobalData = [];
-let inventAllGlobalData = [];
 $(function() {
 
-    IPLATUI.EFGrid = {
+    IPLATUI.EFGrid.result = {
         pageable: {
             pageSize: 20,
             pageSizes: [10, 20, 50, 70, 100],
         },
+        columns: [{
+            field: "createdName",
+            template: function (options) {
+                return showUserName(options.createdBy, options.createdName);
+            }
+        }]
     }
 
     // 查询
@@ -17,45 +20,21 @@ $(function() {
 });
 
 /**
+ * 查询
+ */
+function query () {
+    resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
+}
+
+/**
  * 页面加载时执行
  */
 $(window).load(function () {
-    // 仓库名称
-/*    let inInfo = new EiInfo();
-    inInfo.set("inqu_status-0-inventTypes", [1, 2]);
-    EiCommunicator.send("HPPZ007", "queryComboBox", inInfo, {
-        onSuccess: function (ei) {
-            whNameGlobalData = ei.getBlock("wh_record_block_id").getMappedRows();
-        },
-        onFail: function (ei) {
-        }
-    }, {async: false});
-    // 存货名称
-    EiCommunicator.send("HPPZ004", "queryComboBox", inInfo, {
-        onSuccess: function (ei) {
-            inventNameGlobalData = ei.getBlock("invent_name_block_id").getMappedRows();
-        },
-        onFail: function (ei) {
-        }
-    }, {async: false});
-    // 规格
-    EiCommunicator.send("HPPZ006", "queryComboBoxAll", inInfo, {
-        onSuccess: function (ei) {
-            inventAllGlobalData = ei.getBlock("invent_all_block_id").getMappedRows();
-        },
-        onFail: function (ei) {
-        }
-    }, {async: false});*/
     // 查询
     query();
 });
 
-/**
- * 查询
- */
-let query = function () {
-    resultGrid.dataSource.page(1); // 点击查询按钮，从第1页开始查询
-}
+
 
 
 

src/main/webapp/HP/RZ/HPRZ001.jsp

@@ -9,14 +9,14 @@
 
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
-            <EF:EFSelect cname="企业编码" ename="inqu_status-0-companyCode" colWidth="3" filter="contains" defultValue="">
+     <%--       <EF:EFSelect cname="企业编码" ename="inqu_status-0-companyCode" colWidth="3" filter="contains" defultValue="">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="company_record_block_id" textField="textField" valueField="valueField"/>
-            </EF:EFSelect>
-            <EF:EFInput cname="创建人名称" ename="inqu_status-0-createdName" colWidth="3"/>
+            </EF:EFSelect>--%>
+            <EF:EFInput cname="操作人" ename="inqu_status-0-createdName" colWidth="3"/>
             <EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
-                           startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
-                           format="yyyyMMdd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+                           startName="createdDateFrom" endName="createdDateTo" row="0" role="datetime"
+                           format="yyyy-MM-dd HH:mm" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
             </EF:EFDateSpan>
 
         </div>
@@ -35,17 +35,22 @@
     <EF:EFRegion id="result" title="明细信息">
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="row">
             <EF:EFColumn ename="id" cname="主键id" hidden="true"/>
-            <EF:EFColumn ename="companyCode" cname="企业编码" enable="false" readonly="true" width="100" align="center"/>
-            <EF:EFColumn ename="createdName" cname="创建人名称" enable="false" readonly="true" width="100" align="center"/>
-            <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" readonly="true" width="120" align="center"/>
+            <%--<EF:EFColumn ename="companyCode" cname="企业编码" enable="false" readonly="true" width="100" align="center"/>--%>
+            <EF:EFColumn ename="createdName" cname="操作人" enable="false" readonly="true" width="150" align="center"/>
             <EF:EFColumn ename="operModul" cname="操作模块" enable="false" readonly="true" width="100" align="center"/>
             <EF:EFColumn ename="operType" cname="操作类型" enable="false" readonly="true" width="80" align="center"/>
             <EF:EFColumn ename="operDesc" cname="操作说明" enable="false" readonly="true" width="100" align="center"/>
-            <EF:EFColumn ename="operContent" cname="操作内容" enable="false" readonly="true" width="800" align="center"/>
+            <EF:EFColumn ename="createdTime" cname="创建时间" enable="false" readonly="true" width="120" align="center"
+                         parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
+       <%--     <EF:EFColumn ename="operContent" cname="操作内容" enable="false" readonly="true" width="800" align="center"/>--%>
         </EF:EFGrid>
     </EF:EFRegion>
 
 
 </EF:EFPage>
+<script>
+    var ctx = "${ctx}";
+</script>
+<script src="${ctx}/HP/RZ/HPRZ001.js"></script>
 
 

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

@@ -60,6 +60,7 @@ function query() {
 	resultGrid.dataSource.page(1);
 }
 
+
 /**
  * 拆单派工
  *
@@ -166,3 +167,8 @@ function showGroupDetail(prodOrderNo) {
 	window.open("HPSC005B?methodName=initLoad&inqu_status-0-prodOrderNo=" + prodOrderNo)
 }
 
+$(window).load(function () {
+	// 查询
+	query();
+});
+

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

@@ -3,8 +3,8 @@ $(function () {
     IPLATUI.EFGrid = {
         "result" : {
             pageable: {
-                pageSize: 20,
-                pageSizes: [10, 20, 50, 70, 100],
+                pageSize: 15,
+                pageSizes: [15, 50, 70, 100],
             },
             columns: [{
 	            field: "operator",
@@ -15,14 +15,21 @@ $(function () {
 		            let template = '';
 		            if (filePath1) {
 			            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-				            + 'onclick="showUploadFile(' + filePath1 + ')"  >附件</a>&nbsp;';
+				            + 'onclick="showUploadFile(' + filePath1 + ')"  >附件</a>';
 		            }
 					if (zlprodTaskNo) {
 						template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-							+ 'onclick="showZlDetail(\'' + prodTaskNo + '\')"  >质检单</a>&nbsp;';
+							+ 'onclick="showZlDetail(\'' + prodTaskNo + '\')"  >质检单</a>';
 					}
 		            return template
 	            }
+            }, {
+	            field: "prodTaskNo",
+	            template: function (item) {
+		            let prodTaskNo = item.prodTaskNo;
+		            return '<a style="cursor: pointer;display: inline-flex" '
+			            + ' onclick="tearDetails(\'' + prodTaskNo + '\')"  >' + prodTaskNo + '</a>';
+	            }
             }]
         }
     }
@@ -62,6 +69,20 @@ function showUploadFile(id) {
 	});
 }
 
+/**
+ * 生产任务详情
+ *
+ * @param prodOrderNo
+ */
+function tearDetails(prodTaskNo) {
+	JSColorbox.open({
+		href: "HPSC005D?methodName=initLoad&inqu_status-0-prodTaskNo=" + prodTaskNo,
+		title: "<div style='text-align: center;'>生产任务详情</div>",
+		width: "80%",
+		height: "90%"
+	});
+}
+
 function showZlDetail(prodTaskNo) {
 	window.open("HPZL001?methodName=initLoad&inqu_status-0-prodTaskNo=" + prodTaskNo)
 }

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

@@ -7,16 +7,22 @@
 
 <EF:EFPage title="生产任务">
 	<EF:EFRegion id="inqu" title="查询条件">
+		<EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
 		<div class="row">
-			<EF:EFInput cname="生产订单号" ename="prodOrderNo" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="生产任务号" ename="prodTaskNo" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="项目名称" ename="projName" blockId="inqu_status" row="0" colWidth="3"/>
 			<EF:EFInput cname="部件名称" ename="prdtName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
 		</div>
 		<div class="row">
-			<EF:EFInput cname="零件名称" ename="partName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFInput cname="厂区名称" ename="factoryName" blockId="inqu_status" row="0" colWidth="3"/>
-			<EF:EFInput cname="生产组名称" ename="orgName" blockId="inqu_status" row="0" colWidth="3"/>
+			<EF:EFSelect cname="厂区名称" ename="factoryCode" blockId="inqu_status" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
+			<EF:EFSelect cname="生产组名称" ename="orgNo" blockId="inqu_status" row="0" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 
@@ -24,7 +30,7 @@
 		<EF:EFGrid blockId="result" autoDraw="override">
 			<EF:EFColumn ename="id" cname="主键" hidden="true"/>
 			<EF:EFColumn ename="childId" cname="主键" hidden="true"/>
-			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="80" align="center"/>
+			<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="110" align="center"/>
 			<EF:EFColumn ename="prodTaskNo" cname="生产任务号" enable="false" width="150" align="center"/>
 			<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="prdtName" cname="部件名称" enable="false" width="100" align="center"/>
@@ -32,13 +38,14 @@
 			<EF:EFColumn ename="partSpec" cname="零件规格" enable="false" width="100" align="center"/>
 			<%--<EF:EFColumn ename="remark1" cname="零件备注"/>--%>
 			<EF:EFColumn ename="planCompletionDate" cname="计划完成日期" enable="false" width="120" align="center"/>
-			<EF:EFColumn ename="completeNum" cname="已完成数量" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="num" cname="任务数量" enable="false" width="100" align="right" format="{0:N3}"/>
-			<EF:EFColumn ename="totalWt" cname="任务重量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="completeNum" cname="完成数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="unCompleteNum" cname="剩余数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="num" cname="数量" enable="false" width="100" align="right" format="{0:N3}"/>
+			<EF:EFColumn ename="totalWt" cname="重量" enable="false" width="100" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="factoryName" cname="厂区名称" enable="false" width="140" align="center"/>
 			<EF:EFColumn ename="orgName" cname="生产组名称" enable="false" width="140" align="center"/>
-			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center"/>
-			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center"/>
+			<EF:EFColumn ename="prodOrderNo" cname="生产订单号" enable="false" width="140" align="center" hidden="true"/>
+			<EF:EFColumn ename="projCode" cname="项目号" enable="false" width="140" align="center" hidden="true"/>
 			<EF:EFColumn ename="prdtCode" cname="部件编码" enable="false" width="120" align="center" hidden="true"/>
 			<EF:EFColumn ename="partCode" cname="零件编码" enable="false" width="120" align="center" hidden="true"/>
 		</EF:EFGrid>

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

+let factoryGroupGlobalData = [];
+$(function () {
+
+    IPLATUI.EFGrid = {
+        "result" : {
+	        pageable: {
+		        pageSize: 20,
+		        pageSizes: [10, 20, 50, 70, 100],
+	        },
+	        columns: [{
+		        field: "orgName",
+		        attributes: {
+			        class: "i-input-readonly"
+		        }
+	        }, {
+		        field: "orgNo",
+		        template: function (dataItem) {
+			        for (let i = 0; i < factoryGroupGlobalData.length; i++) {
+				        if (factoryGroupGlobalData[i]['valueField'] === dataItem['orgNo']) {
+					        return factoryGroupGlobalData[i]['textField'];
+				        }
+			        }
+			        return "";
+		        },
+		        editor: function (container, options) {
+			        let inInfo = new EiInfo();
+			        inInfo.set("inqu_status-0-factoryCode", options.model["factoryCode"]);
+			        // 1:生产组
+			        inInfo.set("inqu_status-0-groupType", 1);
+			        inInfo.set("serviceName", "HPPZ011");
+			        inInfo.set("methodName", "queryGroupComboBox");
+			        inInfo.set("blockId", "group_record_block_id");
+			        inInfo.set("field", options.field);
+			        refreshSelect(container, inInfo);
+		        }
+	        }],
+	        onSave: function (e) {
+		        // 阻止后台保存请求，使用自定义保存
+		        e.preventDefault();
+		        save();
+	        },
+	        onDelete: function (e) {
+		        // 阻止后台删除请求，使用自定义删除
+		        e.preventDefault();
+		        deleteFunc();
+	        }
+        }
+    }
+
+
+});
+
+
+
+

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

+<!DOCTYPE html>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
+
+<c:set var="ctx" value="${pageContext.request.contextPath}"/>
+
+<EF:EFPage title="生产任务详情">
+	<EF:EFRegion id="inqu" title="任务详情">
+		<div class="row">
+			<EF:EFInput cname="生产任务号" blockId="result" ename="prodTaskNo" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="生产订单号" blockId="result" ename="prodOrderNo" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="项目号" blockId="result" ename="projCode" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="项目名称" blockId="result" ename="projName" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="部件名称" blockId="result" ename="prdtName" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="零件名称" blockId="result" ename="partName" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件规格" blockId="result" ename="partSpec" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="重量" blockId="result" ename="totalWt" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="零件长" blockId="result" ename="partLength" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件宽" blockId="result" ename="partWidth" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="零件厚" blockId="result" ename="partThick" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFInput cname="完成数量" blockId="result" ename="completeNum" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="剩余数量" blockId="result" ename="unCompleteNum" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="数量" blockId="result" ename="num" row="0" colWidth="4" readonly="true"/>
+		</div>
+		<div class="row">
+			<EF:EFDatePicker cname="计划完成日期" blockId="inqu_status" ename="planCompletionDate"  row="0" colWidth="4"
+			                 format="yyyy-MM-dd" readonly="true"/>
+			<EF:EFInput cname="厂区名称" blockId="result" ename="factoryName" row="0" colWidth="4" readonly="true"/>
+			<EF:EFInput cname="生产组名称" blockId="result" ename="orgName" row="0" colWidth="4" readonly="true"/>
+		</div>
+	</EF:EFRegion>
+</EF:EFPage>

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

 ids = [];
+prdtNameGlobalData = [];
+factoryGroupGlobalData = [];
 $(function () {
 
     $("#QUERY").on("click", function () {
@@ -108,10 +110,69 @@ $(function () {
                     }
                 },{
                     field: "inventName",
-                    query: function (container, options) {
+                    title: "材料名称",
+                    template: function (dataItem) {
+                        for (let i = 0; i < prdtNameGlobalData.length; i++) {
+                            if (prdtNameGlobalData[i]['textField'] === dataItem['prdtName']) {
+                                //dataItem["prdtCode"] = prdtNameGlobalData[i]['valueField']
+                                resultGrid.setCellValue(0, "prdtCode", prdtNameGlobalData[i]['valueField']);
+                                return prdtNameGlobalData[i]['textField'];
+                            }
+                        }
+                        return dataItem["inventName"];
+                    },
+                    editor: function (container, options) {
+                        var grid = container.closest(".k-grid").data("kendoGrid");
+                        var cellIndex = grid.cellIndex(container);
+                        var input = $('<input />');
+                        input.attr("name", options.field);
+                        input.attr("id", options.field);
+                        input.appendTo(container);
                         let eiInfo = new EiInfo();
-                        eiInfo.set("inventType", "7");
-                        return eiInfo;
+                        eiInfo.set("inventType", 7);
+                        eiInfo.set("isSplicingSymbol",false);
+                        var dataSource;
+                        EiCommunicator.send("HPPZ004", "queryComboBox", eiInfo, {
+                            onSuccess: function (ei) {
+                                dataSource = ei.getBlock("invent_name_block_id").getMappedRows();
+                                prdtNameGlobalData = dataSource;
+                            },
+                            onFail: function (ei) {
+                            }
+                        }, {async: false});
+                        input.kendoAutoComplete({
+                            valuePrimitive: true,
+                            dataSource: dataSource,
+                            dataTextField: "textField",
+                            dataValueField: "valueField",
+                            required: "true",
+                            optionLabelTemplate: "#:textField#",
+                            valueTemplate: "#:valueField#",
+                            template: "#:textField#",
+                            filter: "contains"
+                        });
+                    }
+                },
+                 {
+                    field: "orgNo",
+                    template: function (dataItem) {
+                        for (let i = 0; i < factoryGroupGlobalData.length; i++) {
+                            if (factoryGroupGlobalData[i]['valueField'] === dataItem['orgNo']) {
+                                return factoryGroupGlobalData[i]['textField'];
+                            }
+                        }
+                        return "";
+                    },
+                    editor: function (container, options) {
+                        let inInfo = new EiInfo();
+                        inInfo.set("inqu_status-0-factoryCode", options.model["factoryCode"]);
+                        // 1:生产组
+                        inInfo.set("inqu_status-0-groupType", 1);
+                        inInfo.set("serviceName", "HPPZ011");
+                        inInfo.set("methodName", "queryGroupComboBox");
+                        inInfo.set("blockId", "group_record_block_id");
+                        inInfo.set("field", options.field);
+                        refreshSelect(container, inInfo);
                     }
                 }
             ],
@@ -190,6 +251,25 @@ $(function () {
 query = function () {
     resultGrid.dataSource.page(1);
 }
+
+
+
+/**
+ * 页面加载时执行
+ */
+$(window).load(function () {
+    // 生产组名称
+    let inInfo = new EiInfo();
+    inInfo.set("inqu_status-0-groupType", 1);
+    EiCommunicator.send("HPPZ011", "queryGroupComboBox", inInfo, {
+        onSuccess: function (ei) {
+            factoryGroupGlobalData = ei.getBlock("group_record_block_id").getMappedRows();
+        },
+        onFail: function (ei) {
+        }
+    }, {async: false});
+});
+
 function showUploadFile(id) {
     JSColorbox.open({
         href: "HPSC002A?methodName=initLoad&inqu_status-0-bizType=XL&inqu_status-0-id=" + id,

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

@@ -46,38 +46,44 @@
         <EF:EFInput ename="productionOrderNo"  type="hidden"/>
         <EF:EFGrid blockId="detail" autoDraw="no">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
-<%--            <EF:EFComboColumn cname="材料类型" ename="inventType" width="90" align="center" required="true">--%>
-<%--                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('7')"/>--%>
-<%--            </EF:EFComboColumn>--%>
-            <EF:EFPopupColumn ename="inventName" cname="材料名称" width="200" popupType="ServiceGrid" required='true'
+        <EF:EFComboColumn cname="材料类型" ename="inventType" width="80" align="center" required="true" >
+               <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('7')"/>
+         </EF:EFComboColumn>
+           <%-- <EF:EFPopupColumn ename="inventName" cname="材料名称" width="200" popupType="ServiceGrid"
                               popupTitle="材料信息" serviceName="HPPZ004" methodName="queryComboBox" resultId="invent_name_block_id"
                               columnEnames="textField,valueField"
                               columnCnames="材料名称,材料编码"
                               backFillColumnIds="textField,valueField"
                               backFillFieldIds="inventName,inventCode"
-                              valueField="textField" textField="textField"/>
+                              valueField="textField" textField="textField"/>--%>
+            <EF:EFColumn ename="inventName" cname="材料名称" width="200" align="center"  required="true" maxLength="50"/>
             <EF:EFColumn ename="inventCode" enable="false" cname="材料编码" hidden="true"/>
-            <EF:EFColumn ename="inventLength"  cname="长" format="{0:N3}"/>
-            <EF:EFColumn ename="inventWidth"  cname="宽" format="{0:N3}"/>
-            <EF:EFColumn ename="inventThick"  cname="厚" format="{0:N3}"/>
-            <EF:EFColumn ename="material" cname="材质" />
+            <EF:EFColumn ename="inventLength" width="80" cname="长" format="{0:N3}"/>
+            <EF:EFColumn ename="inventWidth" width="80" cname="宽" format="{0:N3}"/>
+            <EF:EFColumn ename="inventThick" width="80" cname="厚" format="{0:N3}"/>
+            <EF:EFColumn ename="material" width="80" cname="材质" />
             <EF:EFColumn ename="remark" cname="备注" />
-            <EF:EFColumn ename="num" cname="计划数量"/>
-            <EF:EFColumn ename="unitWt" format="{0:N3}" cname="计划单重"/>
-            <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" cname="计划总重"/>
-            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"/>
-            <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="150"
+            <EF:EFColumn ename="num" width="80" cname="数量"/>
+            <EF:EFColumn ename="unitWt" format="{0:N3}" width="80" cname="单重"/>
+            <EF:EFColumn enable="false" format="{0:N3}" ename="totalWt" width="80" cname="总重"/>
+            <EF:EFColumn ename="planCompletionDate" required='true' cname="计划完成时间" editType="date" dateFormat="yyyy/MM/dd" width="120"/>
+            <EF:EFColumn ename="actualCompletionDate" cname="实际完成时间" editType="date" dateFormat="yyyy/MM/dd" width="120"
                          enable="false"/>
-            <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" readonly="true"/>
-            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量" readonly="true"/>
-            <EF:EFComboColumn enable="false" align="center" ename="status" cname="状态">
+            <EF:EFColumn enable="false" ename="actualCompletionNum" cname="实际完工数量" width="100" readonly="true"/>
+            <EF:EFColumn enable="false" ename="actualCompletionTotalWt" cname="实际完工重量" width="100" readonly="true"/>
+            <EF:EFComboColumn enable="false" align="center" ename="status" width="80" cname="状态">
                 <EF:EFOption label="计划中" value="0"/>
                 <EF:EFOption label="生产中" value="1"/>
                 <EF:EFOption label="已完成" value="2"/>
             </EF:EFComboColumn>
-            <EF:EFColumn enable="false" ename="factoryName" cname="厂区名称"/>
-            <EF:EFColumn enable="false" ename="orgName" cname="生产组"/>
-            <EF:EFColumn ename="operator" cname="操作" width="100"  enable="false" readonly="false"/>
+            <EF:EFComboColumn ename="factoryCode" cname="厂区" width="110" align="center" required="true"
+                              filter="contains" readonly="true">
+                <EF:EFOptions blockId="factory_record_block_id" valueField="valueField" textField="textField"/>
+            </EF:EFComboColumn>
+            <EF:EFColumn enable="false" ename="factoryName" cname="厂区名称" hidden="true"/>
+            <EF:EFColumn ename="orgNo" cname="生产组" width="110" align="center" required="true" readonly="true"/>
+            <EF:EFColumn enable="false" ename="orgName" cname="生产组" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" width="140"  enable="false" readonly="false"/>
         </EF:EFGrid>
     </EF:EFRegion>
 </EF:EFPage>