2024-06-17 app查询工序产量

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

@@ -111,48 +111,80 @@ import java.util.Map;
     }
 
     /**
+     *  app查询工序累计产量
+     */
+    @OperationLogAnnotation(operModul = "生产任务", operType = "APP查询工序累计产量", operDesc = "APP查询工序累计产量")
+    public EiInfo getProcessSumWt(EiInfo inInfo) {
+        try {
+            EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
+            UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+            String companyCode = queryRow.getCellStr(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code);
+            if (StringUtils.isEmpty(companyCode)) {
+                queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
+            }
+            inInfo = super.query(inInfo,HGSC007.QUERY_SUM_WT);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
+    }
+
+    /**
      *  app查询工序产量
      */
-    @OperationLogAnnotation(operModul = "生产任务", operType = "APP查询产量", operDesc = "APP查询产量")
-    public Map<String,List> getWt(EiInfo inInfo) {
-        Map<String,List> map = new HashMap<>();
+    @OperationLogAnnotation(operModul = "生产任务", operType = "APP查询工序产量", operDesc = "APP查询工序产量")
+    public EiInfo getProcessWt(EiInfo inInfo) {
         try {
+            EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
             UserVO userVO = HGCWTools.HgCw002.getUserCompany();
-            Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-            Object companyCode = queryRow.get(HGSC007.FIELD_company_code);
-            if (companyCode == null) {
-                queryRow.put(HGSC007.FIELD_company_code,userVO.getUsercode());
-                //queryRow.put(HGSC007.FIELD_company_name,userVO.getUsername());
+            String companyCode = queryRow.getCellStr(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code);
+            if (StringUtils.isEmpty(companyCode)) {
+                queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
             }
-            List sumList = DaoBase.getInstance().query(HGSC007.QUERY_SUM_WT, queryRow);
-            List dayList = DaoBase.getInstance().query(HGSC007.QUERY_DAY_WT, queryRow);
-            map.put("sumList",sumList);
-            map.put("dayList",dayList);
+            inInfo = super.query(inInfo,HGSC007.QUERY_DAY_WT);
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "查询失败");
         }
-        return map;
+        return inInfo;
+    }
+
+    /**
+     *  app查询工序产量
+     */
+    @OperationLogAnnotation(operModul = "生产任务", operType = "APP查询工序日产量", operDesc = "APP查询工序日产量")
+    public EiInfo getProcessDayWt(EiInfo inInfo) {
+        try {
+            EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
+            UserVO userVO = HGCWTools.HgCw002.getUserCompany();
+            String companyCode = queryRow.getCellStr(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code);
+            if (StringUtils.isEmpty(companyCode)) {
+                queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
+            }
+            inInfo = super.query(inInfo,HGSC007.QUERY_DAY_WT);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
     }
 
     /**
      *  app查询工序产量
      */
     @OperationLogAnnotation(operModul = "生产任务", operType = "APP查询项目产量", operDesc = "APP查询项目产量")
-    public List getProjCodeWt(EiInfo inInfo) {
-        List sumList = null;
+    public EiInfo getProjCodeWt(EiInfo inInfo) {
         try {
+            EiBlock queryRow = inInfo.getBlock(EiConstant.queryBlock);
             UserVO userVO = HGCWTools.HgCw002.getUserCompany();
-            Map queryRow = EiInfoUtils.getFirstRow(inInfo);
-            Object companyCode = queryRow.get(HGSC007.FIELD_company_code);
-            if (companyCode == null) {
-                queryRow.put(HGSC007.FIELD_company_code,userVO.getUsercode());
-                //queryRow.put(HGSC007.FIELD_company_name,userVO.getUsername());
+            //Map queryRow = EiInfoUtils.getFirstRow(inInfo);
+            String companyCode = queryRow.getCellStr(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code);
+            if (StringUtils.isEmpty(companyCode)) {
+                queryRow.setCell(ACConstants.ROW_CODE_0,HGSC007.FIELD_company_code,userVO.getUsercode());
             }
-            sumList = DaoBase.getInstance().query(HGSC007.QUERY_PROJ_CODE_WT, queryRow);
+            inInfo = super.query(inInfo,HGSC007.QUERY_PROJ_CODE_WT);
         } catch (PlatException e) {
             LogUtils.setDetailMsg(inInfo, e, "查询失败");
         }
-        return sumList;
+        return inInfo;
     }
 
 }