Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC003.java

@@ -143,6 +143,7 @@ public class ServiceHGKC003 extends ServiceBase {
 				Map<?, ?> map = eiBlock.getRow(i);
 				hgkc003.fromMap(map);
 				hgkc003 = HGKCTools.HgKc003.getId(hgkc003.getId());
+				hgkc003.setSubmitStatus(HGConstant.ProductStatus.YTJ);
 				// 校验数据
 				this.checkSubmitData(hgkc003);
 

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

 package com.baosight.hggp.hg.sc.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.sc.domain.HGSC007;
+import com.baosight.hggp.hg.xs.domain.Company;
+import com.baosight.hggp.util.EiInfoUtils;
 import com.baosight.hggp.util.LogUtils;
 import com.baosight.hggp.util.StringUtil;
 import com.baosight.hggp.util.contants.ACConstants;
@@ -10,7 +13,10 @@ import com.baosight.iplat4j.core.ei.EiConstant;
 import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
+import org.apache.commons.lang.StringUtils;
 
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -36,7 +42,7 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
             try {
                 EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
                 String creatTime = block.getCellStr(ACConstants.ROW_CODE_0, HGSC007.FIELD_created_time);
-                if (!creatTime.isEmpty()) {
+                if (StringUtils.isNotBlank(creatTime)) {
                     inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSC007.FIELD_created_time, StringUtil.removeHorizontalLine(creatTime));
                 }
 
@@ -48,6 +54,31 @@ import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
             return inInfo;
         }
 
+
+    @OperationLogAnnotation(operModul = "生产任务", operType = "查询", operDesc = "APP查询数量")
+    public Integer count(EiInfo inInfo) {
+            Integer count = null;
+        try {
+            EiBlock block = inInfo.getBlock(EiConstant.queryBlock);
+            String creatTime = block.getCellStr(ACConstants.ROW_CODE_0, HGSC007.FIELD_created_time);
+            if (StringUtils.isNotBlank(creatTime)) {
+                inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGSC007.FIELD_created_time, StringUtil.removeHorizontalLine(creatTime));
             }
+            Map paramMap = EiInfoUtils.getFirstRow(inInfo);
+            count = super.count(HGSC007.COUNT,paramMap);
+
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return count;
+    }
+
+    @OperationLogAnnotation(operModul = "生产任务", operType = "APP查询公司", operDesc = "APP查询当前登陆用户角色所属公司")
+    public List<Company> getRoleCompany(EiInfo inInfo) {
+        List<Company> companyList = UserSessionUtils.getRoleCompany();
+        return companyList;
+    }
+
+}
 
 

src/main/java/com/baosight/hggp/hg/zl/service/ServiceHGZL002.java

@@ -13,7 +13,7 @@ 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.List;
+import java.util.*;
 
 
 /**
@@ -79,4 +79,25 @@ public class ServiceHGZL002 extends ServiceBase {
 		return inInfo;
 	}
 
+	@OperationLogAnnotation(operModul = "工序质检单", operType = "查询", operDesc = "APP查询数量")
+	public Map<String,Object> count(EiInfo inInfo) {
+		Map<String,Object> resultMap = new HashMap<String,Object>();
+		resultMap.put("quantity",0);
+		resultMap.put("passQuantity",0);
+		resultMap.put("unpassQuantity",0);
+		try {
+			inInfo = super.query(inInfo, HGZL002.QUERY, new HGZL002());
+			List<HGZL002> hgzl002s = MapUtils.toDaoEPBase(inInfo,HGZL002.class);
+			int quantity = Optional.ofNullable(hgzl002s).orElse(new ArrayList<>()).stream().mapToInt(HGZL002::getQuantity).sum();
+			int passQuantity = Optional.ofNullable(hgzl002s).orElse(new ArrayList<>()).stream().mapToInt(HGZL002::getPassQuantity).sum();
+			int unpassQuantity = Optional.ofNullable(hgzl002s).orElse(new ArrayList<>()).stream().mapToInt(HGZL002::getUnpassQuantity).sum();
+			resultMap.put("quantity",quantity);
+			resultMap.put("passQuantity",passQuantity);
+			resultMap.put("unpassQuantity",unpassQuantity);
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return resultMap;
+	}
+
 }

src/main/webapp/HG/KC/HGKC003.js

@@ -17,7 +17,7 @@ $(function () {
 					if (item.id){
 						if (status == 0) {
 							template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-								+ 'onclick="updateSubmitStatus(' + item.id + ',1)" >提交</a>';
+								+ 'onclick="updateSubmitStatus(' + item.id + ')" >提交</a>';
 							template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 								+ 'onclick="sendBack(' + item.id + ')" >退回</a>';
 						}
@@ -132,22 +132,36 @@ function showDetail(id) {
  * @param id
  * @param status
  */
-function updateSubmitStatus(id,status) {
+function updateSubmitStatus(id) {
 	let inEiInfo = new EiInfo();
 	inEiInfo.set("result-0-id", id);
-	inEiInfo.set("result-0-submitStatus", status);
+	JSUtils.confirm("确定提交此生产入库单吗?  ", {
+		ok: function () {
 			EiCommunicator.send('HGKC003', 'updateSubmitStatus', inEiInfo, {
-			onSuccess(response) {
-				NotificationUtil(response.msg);
+					onSuccess: function (ei) {
+						if (ei.getStatus() >= 0) {
+							try {
 								query();
+							} catch (e) {
+							}
+							if (ei.getStatus() == 0) {
+								NotificationUtil(ei, 'warning');
+							} else {
+								NotificationUtil(ei);
+							}
+						} else {
+							NotificationUtil(ei, "error");
+						}
 					},
-			onFail(errorMessage, status, e) {
-				NotificationUtil("执行失败！", "error");
+					onFail: function (ei) {
+						// 发生异常
+						NotificationUtil("操作失败，原因[" + ei + "]", "error");
 					}
-		}, {
-			async: false
 				}
 			);
+		}
+	});
+
 }
 
 /**
@@ -197,16 +211,30 @@ let save = function () {
 function sendBack(id) {
 	let inEiInfo = new EiInfo();
 	inEiInfo.set("result-0-id", id);
+	JSUtils.confirm("确定对此生产入库单进行退回操作吗?  ", {
+		ok: function () {
 			EiCommunicator.send('HGKC003', 'sendBack', inEiInfo, {
-			onSuccess(response) {
-				NotificationUtil(response.msg);
+					onSuccess: function (ei) {
+						if (ei.getStatus() >= 0) {
+							try {
 								query();
+							} catch (e) {
+							}
+							if (ei.getStatus() == 0) {
+								NotificationUtil(ei, 'warning');
+							} else {
+								NotificationUtil(ei);
+							}
+						} else {
+							NotificationUtil(ei, "error");
+						}
 					},
-			onFail(errorMessage, status, e) {
-				NotificationUtil("执行失败！", "error");
+					onFail: function (ei) {
+						// 发生异常
+						NotificationUtil("操作失败，原因[" + ei + "]", "error");
 					}
-		}, {
-			async: false
 				}
 			);
+		}
+	});
 }