Skip to content

H
hg-smart
Commit fe1806af by 宋祥
Options

Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc

parents 720a7513 f3e9a974
Showing with 366 additions and 44 deletions
src/main/java/com/baosight/hggp/controller/FileDownloadController.java
......@@ -82,25 +82,4 @@ public class FileDownloadController {
}
}
/**
* 下载本地文件
*
* @param docId
* @param response
* @throws IOException
*/
@RequestMapping({"docId/{docId}"})
public void downloadUrls(@PathVariable String docId, HttpServletResponse response)
throws IOException {
try {
Map dbDm02 = Iplat4jUtils.getDoc02ById(docId);
String url = MapUtils.getString(dbDm02, "url");
String fileName = MapUtils.getString(dbDm02, "docName");
FileUtils.downloadFile(new File(url), fileName, false, response);
} catch (Exception e) {
String msg = String.format("下载文件【%s】失败！原因：%s", docId, LogUtils.getMsg(e));
response.getWriter().write(msg);
}
}
}
src/main/java/com/baosight/hggp/core/extapp/decheng/model/DcContract.java
......@@ -30,4 +30,10 @@ public class DcContract {
* 设计来源
*/
private String designSource;
/**
* 审批状态
*/
private String spStatus;
}
src/main/java/com/baosight/hggp/core/extapp/decheng/utils/DcApiUtils.java
......@@ -123,6 +123,7 @@ public class DcApiUtils {
dcContract.setHtid(dataJson.getString("Htid"));
dcContract.setTitle(dataJson.getString("Title"));
dcContract.setDesignSource(dataJson.getString("!B__SysCusmf_0_11001_507_0"));
dcContract.setSpStatus(dataJson.getString("SpStatus"));
return dcContract;
}
......
src/main/java/com/baosight/hggp/hg/kc/sql/HGKC014B.xml
......@@ -31,7 +31,9 @@
A.REMAINING_QTY as "remainingQty", <!-- 剩余数量 -->
A.REMAINING_UNIT_WEIGHT as "remainingUnitWeight", <!-- 剩余单量 -->
A.REMAINING_WEIGHT as "remainingWeight", <!-- 剩余重量 -->
A.DELIVER_QTY as "deliverQty" <!-- 退货数量 -->
A.DELIVER_QTY as "deliverQty", <!-- 退货数量 -->
A.INVENT_CODE as "inventCode", <!-- 原料编码 -->
A.INVENT_NAME as "inventName" <!-- 原料名称 -->
</sql>
<sql id="condition">
......
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC012.java
package com.baosight.hggp.hg.sc.service;
import com.baosight.hggp.core.dao.DaoBase;
import com.baosight.hggp.util.EiInfoUtils;
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.service.impl.ServiceEPBase;
import java.util.List;
import java.util.Map;
/**
* @author LiuYang
* @version 1.0 2024/10/23
* @description 委外制造加工表
*/
public class ServiceHGSC012 extends ServiceEPBase {
@Override
public EiInfo initLoad(EiInfo inInfo) {
return inInfo;
}
@Override
public EiInfo query(EiInfo inInfo) {
try {
Map queryMap = EiInfoUtils.getFirstRow(inInfo);
List<Map> list = DaoBase.getInstance().query("HGSC012.query", queryMap);
inInfo.set(EiConstant.resultBlock, list);
}catch (Exception e){
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
}
}
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC098B.java 0 → 100644
package com.baosight.hggp.hg.sc.service;
import com.baosight.hggp.core.constant.CommonConstant;
import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.hg.sc.domain.HGSC007B;
import com.baosight.hggp.util.EiInfoUtils;
import com.baosight.hggp.util.LogUtils;
import com.baosight.hggp.util.MapUtils;
import com.baosight.hggp.util.StringUtils;
import com.baosight.hggp.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
import java.util.List;
import java.util.Map;
/**
* @author LiuYang
* @version 1.0 2024/10/23
* @description
*/
public class ServiceHGSC098B extends ServiceEPBase {
@Override
public EiInfo initLoad(EiInfo inInfo) {
return inInfo;
}
@Override
public EiInfo query(EiInfo inInfo) {
/*String orderDetailIds = inInfo.getCellStr(EiConstant.queryBlock, ACConstants.ROW_CODE_0,"orderDetailIds");
if (StringUtils.isNotEmpty(orderDetailIds)){
String[] ids = orderDetailIds.split(",");
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "orderDetailIds", ids);
}*/
return super.query(inInfo, HGSC007B.QUERY);
}
@Override
public EiInfo delete(EiInfo inInfo) {
return super.delete(inInfo,HGSC007B.DELETE);
}
@Override
public EiInfo update(EiInfo inInfo) {
try {
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (Map resultRow: resultRows) {
HGSC007B hgsc007B = new HGSC007B();
hgsc007B.fromMap(resultRow);
DaoUtils.update(HGSC007B.UPDATE, hgsc007B);
}
inInfo.setMsg("修改成功");
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
}catch (Exception e){
LogUtils.setDetailMsg(inInfo, e, "修改失败");
}
return inInfo;
}
@Override
public EiInfo insert(EiInfo inInfo) {
try {
Map params = EiInfoUtils.getFirstRow(inInfo);
List<Map> resultRows = inInfo.getBlock(EiConstant.resultBlock).getRows();
for (Map resultRow: resultRows) {
HGSC007B hgsc007B = new HGSC007B();
hgsc007B.fromMap(resultRow);
hgsc007B.setDeleteFlag(CommonConstant.YesNo.NO_0);
hgsc007B.setOrderId(Long.parseLong(params.get("orderId").toString()));
//hgsc007B.setOrderDetailId(Long.parseLong(params.get("orderDetailId").toString()));
DaoUtils.insert(HGSC007B.INSERT, hgsc007B);
}
inInfo.setMsg("添加成功");
inInfo.setStatus(EiConstant.STATUS_SUCCESS);
}catch (Exception e){
LogUtils.setDetailMsg(inInfo, e, "添加失败");
}
return inInfo;
}
}
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC101.java
......@@ -5,8 +5,6 @@ import com.baosight.hggp.core.dao.DaoUtils;
import com.baosight.hggp.core.extapp.decheng.api.DcOpenApi;
import com.baosight.hggp.core.extapp.decheng.model.DcContract;
import com.baosight.hggp.core.extapp.decheng.model.DcContractList;
import com.baosight.hggp.core.extapp.decheng.model.DcUser;
import com.baosight.hggp.core.extapp.decheng.model.DcUserList;
import com.baosight.hggp.core.model.Pager;
import com.baosight.hggp.core.utils.ThreadUtils;
import com.baosight.hggp.hg.pz.domain.HGPZ009;
......@@ -16,17 +14,11 @@ import com.baosight.hggp.hg.sc.domain.HGSC001;
import com.baosight.hggp.hg.sc.enums.ProjectSourceEnum;
import com.baosight.hggp.hg.sc.tools.HGSCTools;
import com.baosight.hggp.hg.wd.constant.HgWdSqlConstant;
import com.baosight.hggp.hg.wd.tools.HGWDTools;
import com.baosight.hggp.hg.xs.constant.HgXsSqlConstant;
import com.baosight.hggp.hg.xs.domain.User;
import com.baosight.hggp.hg.xs.tools.HGXSTools;
import com.baosight.hggp.hg.xs.utils.HGXSUtils;
import com.baosight.hggp.util.AssertUtils;
import com.baosight.hggp.util.DateUtils;
import com.baosight.hggp.util.EiInfoUtils;
import com.baosight.hggp.util.LogUtils;
import com.baosight.hggp.util.MapUtils;
import com.baosight.hggp.util.StringUtils;
import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.service.impl.ServiceEPBase;
......@@ -175,9 +167,9 @@ public class ServiceHGSC101 extends ServiceEPBase {
* @param dcContractList
*/
private void syncDcContractSingle(HGPZ009 dbPz009, DcContractList dcContractList) throws IOException {
// 获取用户详情
// 获取合同详情
DcContract dcContract = DcOpenApi.contractDetail(dcContractList.getOrd());
if (dcContract == null) {
if (dcContract == null || !"审批通过".equals(dcContract.getSpStatus())) {
return;
}
dcContract.setOrd(dcContractList.getOrd());
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007B.xml
......@@ -66,6 +66,9 @@
<isNotEmpty prepend=" AND " property="userName">
user_name like concat('%', #userName#, '%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="orderDetailIds">
order_detail_id IN <iterate close=")" open="(" conjunction="," property="orderDetailIds">#orderDetailIds[]#</iterate>
</isNotEmpty>
</sql>
<sql id="orderBy">
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC012.xml
......@@ -2,4 +2,112 @@
<!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN" "http://ibatis.apache.org/dtd/sql-map-2.dtd">
<sqlMap namespace="HGSC012">
<select id="query" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
select
h.COMPANY_CODE as "companyCode", <!-- 公司编码 -->
h.COMPANY_NAME as "companyName", <!-- 公司名称 -->
h.CONTRACT_DATE as "contractDate", <!-- 委托日期 -->
h.CONTRACT_CODE as "contractCode", <!-- 委托单号 -->
h.SUP_CODE as "supCode", <!-- 供应商编码 -->
h.SUP_NAME as "supName", <!-- 供应商名称 -->
h.INVENT_CODE as "lcinventCode", <!-- 原料编码 -->
h.INVENT_NAME as "lcinventName", <!-- 原料名称 -->
h.SPEC_CL as "lcspec",
h.OUT_QTY as "jhckQty", <!-- 出库数量 -->
h.OUT_WEIGHT as "jhckWeight", <!-- 出库重量 -->
hd.OUT_DATE as "outDate", <!-- 出库日期 -->
hd.OUT_QTY as "sjckoutQty", <!-- 出库数量 -->
hd.OUT_WEIGHT as "sjckoutWeight", <!-- 出库重量 -->
h.PRODUCT_CODE as "productCode", <!-- 成品编码 -->
h.PRODUCT_NAME as "productName", <!-- 成品名称 -->
h.SPEC_CP as "rkspec", <!-- 规格 -->
h.DEPOSIT_QTY as "jhrkdepositQty", <!-- 计划入库数量 -->
h.DEPOSIT_WEIGHT as "jhrkdepositWeight", <!-- 计划入库重量 -->
hc.DEPOSIT_DATE as "depositDate", <!-- 入库日期 -->
hc.ACTUAL_QTY as "actualQty", <!-- 实际入库数量 -->
hc.DEPOSIT_WEIGHT as "depositWeight" <!-- 实际入库重量 -->
from (
select
h.COMPANY_CODE ,
h.COMPANY_NAME ,
h.CONTRACT_DATE ,
h.CONTRACT_CODE ,
h.SUP_CODE ,
h.SUP_NAME ,
h.SUB_STATUS,
hb.INVENT_CODE ,
hb.INVENT_NAME ,
hb.SPEC as "SPEC_CL",
hb.OUT_QTY ,
hb.OUT_WEIGHT ,
ha.PRODUCT_CODE ,
ha.PRODUCT_NAME ,
ha.SPEC as "SPEC_CP",
ha.DEPOSIT_QTY ,
ha.DEPOSIT_WEIGHT
from hggp.hgsc010 h
left join hggp.hgsc010a ha on h.ID = ha.PARENT_ID AND h.ACCOUNT_CODE = ha.ACCOUNT_CODE
left join hggp.hgsc010b hb on h.ID = hb.PARENT_ID AND h.ACCOUNT_CODE = ha.ACCOUNT_CODE and ha.INVENT_CODE = hb.INVENT_CODE
where h.SUB_STATUS = 1
<isNotEmpty prepend=" AND " property="accountCode">
h.ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyCode">
h.COMPANY_CODE = #companyCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="companyName">
h.COMPANY_NAME = #companyName#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="contractDate">
h.CONTRACT_DATE = #contractDate#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="contractCode">
h.CONTRACT_CODE like concat('%',#contractCode#,'%')
</isNotEmpty>
<isNotEmpty prepend=" AND " property="supCode">
h.SUP_CODE = #supCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="supName">
h.SUP_NAME = #supName#
</isNotEmpty>
) h
left join (
select
h2.OUT_DATE,
ha2.CONTRACT_CODE ,
ha2.INVENT_CODE ,
ha2.INVENT_NAME ,
ha2.SPEC,
ha2.OUT_QTY ,
ha2.OUT_WEIGHT
from hggp.hgkc015 h2
inner join hggp.hgkc015a ha2 on h2.OUT_CODE = ha2.OUT_CODE
where STATUS = 1 and h2.DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="accountCode">
h2.ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="contractCode">
h2.CONTRACT_CODE like concat('%',#contractCode#,'%')
</isNotEmpty>
) hd on h.CONTRACT_CODE = hd.CONTRACT_CODE and h.INVENT_CODE = hd.INVENT_CODE
left join (
select
h2.DEPOSIT_DATE,
ha2.CONTRACT_CODE,
ha2.PRODUCT_CODE,
ha2.PRODUCT_NAME,
ha2.SPEC,
ha2.ACTUAL_QTY,
ha2.ACTUAL_QTY*ha2.DEPOSIT_UNIT_WEIGHT as "DEPOSIT_WEIGHT"
from hggp.hgkc014 h2
inner join hggp.hgkc014a ha2 on h2.DEPOSIT_CODE = ha2.DEPOSIT_CODE
where h2.STATUS = 3 and h2.DELETE_FLAG = 0
<isNotEmpty prepend=" AND " property="accountCode">
h2.ACCOUNT_CODE = #accountCode#
</isNotEmpty>
<isNotEmpty prepend=" AND " property="contractCode">
h2.CONTRACT_CODE like concat('%',#contractCode#,'%')
</isNotEmpty>
) hc on h.CONTRACT_CODE = hc.CONTRACT_CODE and h.PRODUCT_CODE = hc.PRODUCT_CODE
</select>
</sqlMap>
\ No newline at end of file
src/main/webapp/HG/KC/HGKC014B.jsp
......@@ -76,10 +76,10 @@
align="center" filter="contains" sort="true">
<EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="subStatus" cname="提交状态" width="80" enable="true" readonly="true" align="center"
<%--<EF:EFComboColumn ename="subStatus" cname="提交状态" width="80" enable="true" readonly="true" align="center"
required="false" defaultValue="0">
<EF:EFCodeOption codeName="hggp.hpkc.submitStatus"/>
</EF:EFComboColumn>
</EF:EFComboColumn>--%>
<EF:EFComboColumn ename="productCode" cname="成品编码" width="120" align="center" required="true" readonly="true"
blockName="invent_record_box_block_id" textField="textField" valueField="valueField"
columnTemplate="#=textField#" itemTemplate="#=textField#"
......@@ -91,6 +91,8 @@
columnTemplate="#=textField#" itemTemplate="#=textField#"
filter="contains">
</EF:EFComboColumn>
<EF:EFColumn ename="inventCode" cname="材料编码" enable="false" width="120" align="center" required="false"/>
<EF:EFColumn ename="inventName" cname="材料名称" enable="false" width="120" align="center" required="false"/>
<EF:EFColumn ename="spec" cname="规格" width="140" align="center" maxLength="50" readonly="true"/>
<EF:EFColumn ename="unit" cname="单位" width="80" align="center" readonly="true"/>
<EF:EFColumn ename="depositQty" cname="入库数量" width="100" enable="true" format="{0:N0}" editType="text"
......
src/main/webapp/HG/SC/HGSC006.js
......@@ -13,7 +13,7 @@ $(function () {
field: "operator",
template: function (item) {
let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showInfo(\'' + item.orderCode + '\')" >订单详情</a>';
+ 'onclick="showInfo(\'' + item.orderCode + '\',' + item.id + ')" >订单详情</a>';
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showUploadFile(' + item.matId + ')" >附件详情</a>';
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
......@@ -44,9 +44,9 @@ $(window).load(function () {
query();
});
function showInfo(orderCode) {
function showInfo(orderCode,id) {
JSColorbox.open({
href: "HGSC006A?methodName=initLoad&inqu_status-0-orderCode=" + orderCode + "&efParentFormEname=HGSC006",
href: "HGSC006A?methodName=initLoad&inqu_status-0-orderCode=" + orderCode + "&inqu_status-0-orderId=" + id + "&efParentFormEname=HGSC006",
title: "<div style='text-align: center;'>生产订单详情</div>",
width: "90%",
height: "90%"
......
src/main/webapp/HG/SC/HGSC006A.js
......@@ -87,7 +87,11 @@ function assign() {
if(flag) {
let companyCode = rows[0].companyCode;
JSColorbox.open({
href: "HGSC098?methodName=initLoad&inqu_status-0-companyCode=" + companyCode + "&inqu_status-0-productType=" + productType,
href: "HGSC098?methodName=initLoad" +
"&inqu_status-0-companyCode=" + companyCode +
"&inqu_status-0-orderId=" + $("#inqu_status-0-orderId").val() +
"&inqu_status-0-orderDetailIds=" + ids +
"&inqu_status-0-productType=" + productType,
title: "<div style='text-align: center;'>选择组织</div>",
width: "90%",
height: "90%",
......@@ -152,7 +156,10 @@ function assignAll() {
if(flag) {
let companyCode = rows[0].companyCode;
JSColorbox.open({
href: "HGSC098?methodName=initLoad&inqu_status-0-companyCode=" + companyCode + "&inqu_status-0-productType=" + productType,
href: "HGSC098?methodName=initLoad" +
"&inqu_status-0-companyCode=" + companyCode +
"&inqu_status-0-orderId=" + $("#inqu_status-0-orderId").val() +
"&inqu_status-0-productType=" + productType,
title: "<div style='text-align: center;'>选择组织</div>",
width: "90%",
height: "90%",
......@@ -215,7 +222,10 @@ function assignChange() {
if(flag) {
let companyCode = rows[0].companyCode;
JSColorbox.open({
href: "HGSC098?methodName=initLoad&inqu_status-0-companyCode=" + companyCode + "&inqu_status-0-productType=" + productType,
href: "HGSC098?methodName=initLoad" +
"&inqu_status-0-companyCode=" + companyCode + "" +
"&inqu_status-0-orderId=" + $("#inqu_status-0-orderId").val() +
"&inqu_status-0-productType=" + productType,
title: "<div style='text-align: center;'>改派订单</div>",
width: "90%",
height: "90%",
......@@ -287,7 +297,10 @@ function assignChangeAll() {
if(flag) {
let companyCode = rows[0].companyCode;
JSColorbox.open({
href: "HGSC098?methodName=initLoad&inqu_status-0-companyCode=" + companyCode + "&inqu_status-0-productType=" + productType,
href: "HGSC098?methodName=initLoad" +
"&inqu_status-0-companyCode=" + companyCode +
"&inqu_status-0-orderId=" + $("#inqu_status-0-orderId").val() +
"&inqu_status-0-productType=" + productType,
title: "<div style='text-align: center;'>改派订单</div>",
width: "90%",
height: "90%",
......
src/main/webapp/HG/SC/HGSC006A.jsp
......@@ -14,6 +14,7 @@
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFInput ename="inqu_status-0-orderCode" cname="订单编码" type="hidden"/>
<EF:EFInput ename="inqu_status-0-orderId" cname="订单编码" type="hidden"/>
<EF:EFInput ename="inqu_status-0-productCode" cname="产品编码" placeholder="模糊查询" colWidth="3"/>
<EF:EFInput ename="inqu_status-0-productName" cname="产品名称" placeholder="模糊查询" colWidth="3"/>
<EF:EFInput ename="inqu_status-0-projName" cname="项目名称" placeholder="模糊查询" colWidth="3"/>
......
src/main/webapp/HG/SC/HGSC010A.js
......@@ -231,13 +231,13 @@ let saveResult = function (btnNode) {
flag = false;
return false;
}
if (!isPositiveInteger(pcsWeight)) {
if (isBlank(pcsWeight) || !isNumber(pcsWeight) || pcsWeight <= 0) {
message("勾选的第" + (index + 1) + "行加工重量必须是大于0");
flag = false;
return false;
}
if (detailRows.length>0 && isBlank(item.get("inventCode"))){
message("选中的第" + (index + 1) + "行\"原料编码\"，不能为空!");
message("选中的第" + (index + 1) + "行\"材料编码\"，不能为空!");
flag = false;
return false;
}
......@@ -274,6 +274,16 @@ let saveDetail = function (btnNode) {
flag = false;
return false;
}
if (!isPositiveInteger(item.pcsQty)) {
message("勾选的第" + (index + 1) + "行加工数量必须是大于0");
flag = false;
return false;
}
if (isBlank(item.pcsWeight) || !isNumber(item.pcsWeight) || item.pcsWeight <= 0) {
message("勾选的第" + (index + 1) + "行加工重量必须是大于0");
flag = false;
return false;
}
});
if (flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"保存\"操作? ", {
......
src/main/webapp/HG/SC/HGSC098.js
......@@ -15,8 +15,11 @@ $(function () {
title: "班组人员",
template: function (item) {
if (!isBlank(item.groupCode)){
return '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="showGroupUser(\''+ item.groupCode + '\')" >查看</a>';
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="addGroupUser(\''+ item.factoryCode + '\',\''+ item.factoryName + '\',\''+ item.groupCode + '\',\''+ item.groupName + '\')" >添加人员</a>';
return template;
}else {
message("未选择班组")
return "";
......@@ -69,3 +72,18 @@ function showGroupUser(id) {
height: "90%",
});
}
/*"&inqu_status-0-orderDetailIds=" + $("#inqu_status-0-orderDetailIds").val() + "" +*/
function addGroupUser(factoryCode,factoryName,groupCode,groupName) {
JSColorbox.open({
href: "HGSC098B?methodName=initLoad" +
"&inqu_status-0-factoryCode=" + factoryCode + "" +
"&inqu_status-0-factoryName=" + factoryName + "" +
"&inqu_status-0-orderId=" + $("#inqu_status-0-orderId").val() + "" +
"&inqu_status-0-groupCode=" + groupCode + "" +
"&inqu_status-0-groupName=" + groupName + "&efParentFormEname=HGSC098",
title: "<div style='text-align: center;'>添加班组人员</div>",
width: "90%",
height: "90%",
})
}
\ No newline at end of file
src/main/webapp/HG/SC/HGSC098.jsp
......@@ -8,6 +8,8 @@
<EF:EFPage title="组织机构">
<EF:EFRegion id="inqu" title="查询条件">
<EF:EFInput cname="公司编码" ename="companyCode" blockId="inqu_status" row="0" type="hidden"/>
<EF:EFInput cname="订单Id" ename="orderId" blockId="inqu_status" row="0" type="hidden"/>
<EF:EFInput cname="任务详情ID" ename="orderDetailIds" blockId="inqu_status" row="0" type="hidden"/>
<EF:EFInput cname="产品类型" ename="productType" blockId="inqu_status" row="0" type="hidden"/>
<div class="row">
<EF:EFSelect ename="inqu_status-0-factoryCode" cname="工厂" colWidth="4" filter="contains"
......
src/main/webapp/HG/SC/HGSC098B.js 0 → 100644
$(function () {
IPLATUI.EFGrid.result = {
pageable: {
pageSize: 10,
pageSizes: [10, 20, 50, 100, 200],
},
onAdd: function (e) {
$.each(e.items, function (index, item) {
item['factoryCode'] = $("#inqu_status-0-factoryCode").val();
item['factoryName'] = $("#inqu_status-0-factoryName").val();
item['groupCode'] = $("#inqu_status-0-groupCode").val();
item['groupName'] = $("#inqu_status-0-groupName").val();
});
},
columns: []
}
// 查询
$("#QUERY").on("click", query);
});
/**
* 初始化
*/
$(window).load(function () {
// 查询
query();
});
/**
* 查询
*/
function query() {
resultGrid.dataSource.page(1);
}
\ No newline at end of file
src/main/webapp/HG/SC/HGSC098B.jsp 0 → 100644
<%--
Created by IntelliJ IDEA.
User: 1
Date: 2024/10/23
Time: 10:59
To change this template use File | Settings | File Templates.
--%>
<!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="查询条件">
<EF:EFInput ename="orderId" cname="生产订单编号" blockId="inqu_status" row="0" type="hidden"/>
<%--<EF:EFInput ename="orderDetailIds" cname="生产订单ID" blockId="inqu_status" row="0" type="hidden"/>--%>
<div class="row">
<EF:EFInput ename="factoryCode" cname="工厂编码" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
<EF:EFInput ename="factoryName" cname="工厂名称" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
<EF:EFInput ename="groupCode" cname="班组编码" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
<EF:EFInput ename="groupName" cname="班组名称" blockId="inqu_status" row="0" colWidth="3" type="hidden"/>
<EF:EFInput ename="userName" cname="人员姓名" blockId="inqu_status" row="0" colWidth="3"/>
</div>
</EF:EFRegion>
<EF:EFRegion id="result" title="数据集" fitHeight="true">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true" autoBind="false">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="factoryCode" cname="工厂编码" enable="false" width="120" align="center"/>
<EF:EFColumn ename="factoryName" cname="工厂名称" enable="false" width="120" align="center"/>
<EF:EFColumn ename="groupCode" cname="班组编码" enable="false" width="120" align="center"/>
<EF:EFColumn ename="groupName" cname="班组名称" enable="false" width="120" align="center"/>
<EF:EFColumn ename="userName" cname="人员名称" enable="true" width="120" align="center"/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFPage>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment