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

src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW004.java

@@ -82,6 +82,7 @@ public class ServiceHGCW004 extends ServiceBase {
                 UserVO userVO = HGCWTools.HgCw002.getUserCompany();
                 HGCW004.setCompanyCode(userVO.getUsercode());
                 HGCW004.setCompanyName(userVO.getUsername());
+                HGCW004.setContractName(userVO.getUsername());
                 if (HGCW004.getId() == null || HGCW004.getId() == 0) {
                     this.add(HGCW004);
                 } else {

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

+package com.baosight.hggp.hg.sc.service;
+
+import com.baosight.hggp.common.DdynamicEnum;
+import com.baosight.hggp.core.constant.CommonConstant;
+import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.tools.EDTools;
+import com.baosight.hggp.hg.ds.domain.HGDS002;
+import com.baosight.hggp.hg.sc.domain.HGSC099;
+import com.baosight.hggp.hg.sj.domain.HGSJ003;
+import com.baosight.hggp.util.FileUtils;
+import com.baosight.hggp.util.LogUtils;
+import com.baosight.hggp.util.contants.ACConstants;
+import com.baosight.iplat4j.core.ProjectInfo;
+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 com.baosight.iplat4j.core.service.soa.XServiceManager;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * @Author wwl
+ * @Date 2024/5/6 19:48
+ */
+public class ServiceHGSC004B extends ServiceEPBase {
+
+	/**
+	 * 画面初始化
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo initLoad(EiInfo inInfo) {
+		try {
+			inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGSC099().eiMetadata);
+		} catch (PlatException e) {
+			LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 查询操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	public EiInfo query(EiInfo inInfo) {
+		try {
+			// 项目环境
+			String projectEnv = ProjectInfo.getProjectEnv();
+			List<Map<String, Object>> EDCM01List = EDTools.EdCm01.list("hggp.sc.bizType");
+			if(!CollectionUtils.isEmpty(EDCM01List)){
+				List<String> bizTypes = new ArrayList<>();
+				for(Map<String, Object> map : EDCM01List){
+					bizTypes.add(map.get("itemCode").toString());
+				}
+				inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "bizTypes",bizTypes);
+			}
+			if (CommonConstant.projectEnv.RUN.equalsIgnoreCase(projectEnv)) {
+				inInfo = super.query(inInfo, "HGSC099.queryRun", new HGSC099());
+			} else {
+				inInfo = super.query(inInfo, "HGSC099.queryDev", new HGSC099());
+			}
+		} catch (Throwable e) {
+			LogUtils.setDetailMsg(inInfo, e, "查询失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 新增操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	@Override
+	public EiInfo insert(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGSC099 hgsc099 = new HGSC099();
+				hgsc099.fromMap(resultRows.get(i));
+				DaoUtils.insert(HGSC099.INSERT, hgsc099);
+			}
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据新增成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "新增失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 删除操作
+	 *
+	 * @param inInfo
+	 * @return
+	 */
+	public EiInfo delete(EiInfo inInfo) {
+		try {
+			List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
+			for (int i = 0; i < resultRows.size(); i++) {
+				HGSC099 hgsc099 = new HGSC099();
+				hgsc099.fromMap(resultRows.get(i));
+				DaoUtils.update(HGSC099.DELETE, hgsc099);
+				if (!hgsc099.getDocId().isEmpty()) {
+					this.delectDoc(hgsc099.getDocId());
+				}
+			}
+			inInfo = this.query(inInfo);
+			inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+			inInfo.setMsg("操作成功！本次对[" + resultRows.size() + "]条数据删除成功!");
+		} catch (Exception e) {
+			LogUtils.setDetailMsg(inInfo, e, "删除失败");
+		}
+		return inInfo;
+	}
+
+	/**
+	 * 删除文件
+	 * @param docId 文件ID
+	 */
+	public void delectDoc(String docId){
+		Map<String,Object> map = new HashMap<>();
+		map.put("docId",docId);
+		List<HGDS002> list = this.dao.query(HGDS002.QUERY,map);
+		if (list.size() > 0) {
+			String realPath = list.get(0).getRealPath();
+			// 项目环境
+			String projectEnv = ProjectInfo.getProjectEnv();
+			if (projectEnv.equals(CommonConstant.projectEnv.RUN)) {
+				EiInfo queryInfo = new EiInfo();
+				queryInfo.set(HGSC099.FIELD_doc_id,list.get(0).getDocId());
+				//获取文档信息
+				queryInfo.set(EiConstant.serviceId,"S_EU_0102");
+				EiInfo docInfo = XServiceManager.call(queryInfo);
+				//数据库
+				Map docInfoMap = docInfo.getMap("docMap");
+				if (docInfoMap.size() > 0) {
+					EiInfo eiInfo = new EiInfo();
+					eiInfo.set("data",docInfoMap.get("url")+"-"+0);
+					eiInfo.set(EiConstant.serviceId,"S_EU_0105");
+					//调用接口
+					EiInfo outInfo = XServiceManager.call(eiInfo);
+
+					if(outInfo.getStatus() == EiConstant.STATUS_FAILURE){
+						LogUtils.setDetailMsg(outInfo, new Throwable(), "查询部件类型失败");
+						outInfo.setMsg("失败");
+					}
+				}
+			}else {
+				FileUtils.deleteFile(realPath);
+			}
+			this.dao.delete(HGDS002.DELETE,map);
+		}
+
+	}
+}

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

+package com.baosight.hggp.hg.sc.service;
+
+import com.baosight.iplat4j.core.ei.EiInfo;
+import com.baosight.iplat4j.core.service.impl.ServiceBase;
+
+/**
+ *
+ */
+public class ServiceHGSC004C extends ServiceBase {
+
+
+    /**
+     * 画面初始化.
+     */
+    public EiInfo initLoad(EiInfo inInfo) {
+        return inInfo;
+    }
+
+
+    /**
+     * 附件上传.
+     */
+    public EiInfo form(EiInfo inInfo) {
+        return inInfo;
+    }
+
+}

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

+package com.baosight.hggp.hg.sc.service;
+
+import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
+import com.baosight.hggp.hg.sc.domain.HGSC005A;
+import com.baosight.hggp.hg.sc.domain.HGSC006A;
+import com.baosight.hggp.util.LogUtils;
+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.ServiceBase;
+
+
+/**
+ * @Author wwl
+ * @Date 2024/5/6 19:48
+ */
+public class ServiceHGSC006A extends ServiceBase {
+
+    @OperationLogAnnotation(operModul = "生产订单详情", operType = "查询", operDesc = "初始化页面")
+    public EiInfo initLoad(EiInfo inInfo) {
+        try {
+            String planCode = inInfo.getCellStr(EiConstant.queryBlock,0,HGSC006A.FIELD_order_code);
+            inInfo = super.query(inInfo, HGSC006A.QUERY, new HGSC006A());
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "初始化失败");
+        }
+        return inInfo;
+    }
+
+    @OperationLogAnnotation(operModul = "生产订单详情", operType = "查询", operDesc = "查询")
+    public EiInfo query(EiInfo inInfo) {
+        try {
+            inInfo = super.query(inInfo, HGSC005A.QUERY, new HGSC005A());
+            inInfo.setStatus(EiConstant.STATUS_DEFAULT);
+        } catch (PlatException e) {
+            LogUtils.setDetailMsg(inInfo, e, "查询失败");
+        }
+        return inInfo;
+    }
+
+}
+

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC006.xml

@@ -40,16 +40,16 @@
 			company_code = #companyCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="companyName">
-			company_name = #companyName#
+			company_name like ('%$companyName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projCode">
 			proj_code = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			proj_name = #projName#
+			proj_name like ('%projName%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="orderCode">
-			order_code = #orderCode#
+			order_code like ('%orderCode%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="assignStatus">
 			assign_status = #assignStatus#

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC006A.xml

@@ -85,7 +85,7 @@
 			proj_code = #projCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
-			proj_name = #projName#
+			proj_name like ('%projName%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="orderCode">
 			order_code = #orderCode#
@@ -97,7 +97,7 @@
 			product_code = #productCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="productName">
-			product_name = #productName#
+			product_name like ('%productName%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="assignDate">
 			assign_date = #assignDate#

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC099.xml

@@ -72,6 +72,9 @@
 		<isNotEmpty prepend=" AND " property="matId">
 			A.MAT_ID = #matId#
 		</isNotEmpty>
+		<isNotEmpty prepend=" AND " property="bizTypes">
+			A.BIZ_TYPE IN <iterate close=")" open="(" conjunction="," property="bizTypes">#bizTypes[]#</iterate>
+		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="docId">
 			A.DOC_ID = #docId#
 		</isNotEmpty>

src/main/webapp/HG/CW/HGCW004.jsp

@@ -20,7 +20,7 @@
             <EF:EFInput cname="乙方名称" ename="partyB" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFDateSpan startCname="签订日期(从)" endCname="至" blockId="inqu_status"
                            startName="signingDateFrom" endName="signingDateTo" row="0" role="date"
-                           format="yyyyMMdd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+                           format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
             </EF:EFDateSpan>
             <EF:EFInput cname="主合同名称" ename="contractName" blockId="inqu_status" row="0" colWidth="3" />
             <EF:EFSelect cname="审批状态" ename="inqu_status-0-reviewStatus" colWidth="3" filter="contains">
@@ -55,7 +55,7 @@
             <EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true" readonly="true" align="center" required="true"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" readonly="true" align="center" required="true"/>
             <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true" readonly="true" align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd']" required="true"/>
             <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
                 <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>

src/main/webapp/HG/SC/HGSC004.js

@@ -233,7 +233,7 @@ function showDetail(id,companyCode,projCode) {
  */
 function showUploadFile(id) {
     JSColorbox.open({
-        href: "HGSC099?methodName=initLoad&inqu_status-0-bizType=WLQD&inqu_status-0-matId=" + id,
+        href: "HGSC004B?methodName=initLoad&inqu_status-0-matId=" + id,
         title: "<div style='text-align: center;'>附件详情</div>",
         width: "80%",
         height: "80%",

src/main/webapp/HG/SC/HGSC004B.js

@@ -52,7 +52,7 @@ var query = function (e) {
  */
 function uploadFile(id) {
 	JSColorbox.open({
-		href: "HGSC099A?methodName=initLoad&inqu_status-0-bizType="+$("#inqu_status-0-bizType").val()+"&inqu_status-0-matId="+$("#inqu_status-0-matId").val(),
+		href: "HGSC004C?methodName=initLoad&inqu_status-0-matId="+$("#inqu_status-0-matId").val(),
 		title: "<div style='text-align: center;'>附件上传</div>",
 		width: "60%",
 		height: "50%",
@@ -65,12 +65,12 @@ function uploadFile(id) {
  *
  * @param docId
  */
-function uploadFileCallback(docId) {
+function uploadFileCallback(docId,bizType) {
 	let inEiInfo = new EiInfo();
 	inEiInfo.set("result-0-matId", $("#inqu_status-0-matId").val());
 	inEiInfo.set("result-0-docId", docId);
-	inEiInfo.set("result-0-bizType", $("#inqu_status-0-bizType").val());
-	EiCommunicator.send('HGSC099', 'insert', inEiInfo, {
+	inEiInfo.set("result-0-bizType", bizType);
+	EiCommunicator.send('HGSC004B', 'insert', inEiInfo, {
 		onSuccess(response) {
 			resultGrid.dataSource.page(1);
 		},
@@ -93,7 +93,7 @@ function deleteFunc() {
 	}
 	JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"删除\"操作?", {
 		ok: function () {
-			JSUtils.submitGridsData("result", "HGSC099", "delete", true);
+			JSUtils.submitGridsData("result", "HGSC004B", "delete", true);
 		}
 	})
 }

src/main/webapp/HG/SC/HGSC004B.jsp

@@ -8,8 +8,11 @@
 <EF:EFPage title="附件清单">
 	<EF:EFRegion id="inqu" title="查询区域" type="query">
 		<EF:EFInput cname="主表ID" ename="matId" blockId="inqu_status" row="0" type="hidden"/>
-		<EF:EFInput cname="业务类型" ename="bizType" blockId="inqu_status" row="0" type="hidden"/>
 		<div class="row">
+			<EF:EFSelect cname="文件类型" ename="inqu_status-0-bizType" colWidth="3" filter="contains">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hggp.sc.bizType" />
+			</EF:EFSelect>
 			<EF:EFInput cname="文件名称" ename="docName" blockId="inqu_status" row="0" colWidth="3" />
 		</div>
 	</EF:EFRegion>
@@ -19,6 +22,9 @@
 			<EF:EFColumn ename="id" cname="ID" hidden="true"/>
 			<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="150"/>
 			<EF:EFColumn ename="docName" cname="文件名称" enable="false" width="150"/>
+			<EF:EFComboColumn ename="bizType" cname="文件类型" width="80" align="center" enable="false"  required="false">
+				<EF:EFCodeOption codeName="hggp.sc.bizType" />
+			</EF:EFComboColumn>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"
 			             parseFormats="['yyyyMMddHHmmss']" editType="datetime" dateFormat="yyyy-MM-dd HH:mm:ss"/>
 			<EF:EFColumn ename="operator" cname="操作" enable="false" width="200" align="center"/>

src/main/webapp/HG/SC/HGSC004C.js

@@ -13,7 +13,7 @@ $(function () {
                 console.log($("#fileDocId").val())
                 saveTemp(e);
 	            try {
-		            parent.JSColorbox.setValueCallback(docId);
+		            parent.JSColorbox.setValueCallback(docId,$("#inqu_status-0-bizType").val());
 	            } catch (e){
 	            }
             },

src/main/webapp/HG/SC/HGSC004C.jsp

@@ -7,7 +7,10 @@
 
 <EF:EFPage title="附件上传">
     <EF:EFInput cname="主表ID" ename="matId" blockId="inqu_status" row="0" type="hidden"/>
-    <EF:EFInput cname="业务类型" ename="bizType" blockId="inqu_status" row="0" type="hidden"/>
+    <EF:EFSelect cname="业务类型" ename="inqu_status-0-bizType" colWidth="3" filter="contains">
+        <EF:EFOption label="全部" value=""/>
+        <EF:EFCodeOption codeName="hggp.sc.bizType" />
+    </EF:EFSelect>
     <EF:EFRegion id="result">
         <EF:EFUpload blockId="result" ename="uploadFile" docTag="hk_file11" path="HGSC"/>
     </EF:EFRegion>

src/main/webapp/HG/SC/HGSC006.jsp

@@ -34,7 +34,7 @@
             <EF:EFColumn ename="projCode" cname="项目编码" enable="true" width="120" align="center" readOnly="true"/>
             <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="true" align="center" readOnly="true"/>
             <EF:EFColumn ename="createdTime" cname="生产订单日期" enable="true" width="120" align="center" readOnly="true"/>
-            <EF:EFColumn ename="planCode" cname="生产订单号" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="orderCode" cname="生产订单编号" enable="true" width="120" align="center" readOnly="true"/>
             <EF:EFComboColumn ename="assignStatus" cname="派工状态" width="80" align="center" required="true"
                               readonly="true">
                 <EF:EFCodeOption codeName="hggp.assignStatus"/>

src/main/webapp/HG/SC/HGSC006A.js

+$(function () {
+
+    $("#QUERY").on("click", function () {
+        resultGrid.dataSource.page(1);
+    });
+
+
+    IPLATUI.EFGrid.result = {
+        pageable: {
+            pageSize: 20,
+            pageSizes: [10, 20, 50, 70, 100],
+        },
+        columns: [{
+            field: "operator",
+            template: function (item) {
+                let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' +
+                    'onclick="showTaskInfo(' + item.id + ')" >任务详情</a>';
+                return template;
+            }
+        }],
+        loadComplete: function(grid) {
+        },
+        onSuccess: function (e) {
+            if(e.eiInfo.extAttr.methodName == 'save'||e.eiInfo.extAttr.methodName == 'delete' ){
+                query();
+            }
+        }
+    }
+
+});
+
+function showTaskInfo(orderDetailId) {
+    // JSColorbox.open({
+    //     href: "HGSC007?methodName=initLoad&inqu_status-0-orderDetailId=" + orderDetailId + "&efParentFormEname=HGSC006A",
+    //     title: "<div style='text-align: center;'>生产任务详情</div>",
+    //     width: "90%",
+    //     height: "90%"
+    // });
+}
\ No newline at end of file

src/main/webapp/HG/SC/HGSC006A.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}"/>
+
+<script>
+    var ctx = "${ctx}";
+</script>
+<head>
+</head>
+<EF:EFPage title="生产计划详情">
+    <EF:EFRegion id="inqu" title="查询条件">
+        <div class="row">
+            <EF:EFInput ename="inqu_status-0-orderCode" cname="订单编码" type="hidden"/>
+            <EF:EFInput ename="inqu_status-0-productName" cname="产品名称" colWidth="3"/>
+            <EF:EFInput ename="inqu_status-0-projName" cname="项目名称" colWidth="3"/>
+            <EF:EFDatePicker cname="生产订单" ename="inqu_status-0-createdTime"  colWidth="3"
+                             format="yyyy-MM-dd" readonly="false"/>
+            <EF:EFDatePicker cname="派工日期" ename="inqu_status-0-assignDate"  colWidth="3"
+                             format="yyyy-MM-dd" readonly="false"/>
+        </div>
+    </EF:EFRegion>
+    <EF:EFRegion id="result" title="记录集">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
+            <EF:EFColumn ename="id" cname="主键" hidden="true"/>
+            <EF:EFColumn ename="operator" cname="操作" locked="true" enable="true" width="100" align="center" />
+            <EF:EFColumn ename="companyName" cname="公司名称" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="projName" cname="项目名称" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="createdTime" cname="生产订单日期" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="orderCode" cname="生产订单编号" enable="true" width="120" align="center" readOnly="true"/>
+            <EF:EFColumn ename="productCode" cname="产品编码" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="productName" cname="产品名称" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="processName" cname="工序" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="planEndDate" cname="计划完工日期" width="120" enable="true" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFColumn ename="quantity" cname="订单数量" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="assignDate" cname="派工日期" width="120" enable="true" align="center" editType="date"
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
+            <EF:EFColumn ename="assignQuantity" cname="派工数量" width="120" enable="true" align="center" readOnly="true"/>
+            <EF:EFColumn ename="unassignQuantity" cname="待派工数量" width="120" enable="true" align="center" readOnly="true"/>
+        </EF:EFGrid>
+    </EF:EFRegion>
+</EF:EFPage>