Skip to content

K
kwell-mes
Commit e8e320f4 authored by 李苏's avatar 李苏 💬
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

parents 3033f611 fec40c4d
Hide whitespace changes
Inline Side-by-side
Showing with 490 additions and 672 deletions
gavel/src/main/java/com/gavel/kwell/controller/GpfkForBzgxFjController.java 0 → 100644
View file @ e8e320f4
package com.gavel.kwell.controller;
import java.io.FileInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import com.gavel.common.attachment.persistent.Attachment;
import com.gavel.common.base.controller.BaseController;
import com.gavel.kwell.service.GpfkfjService;
import io.swagger.annotations.ApiOperation;
@Controller
@RequestMapping("kmes/gpfkfj")
public class GpfkForBzgxFjController extends BaseController {
@Autowired
private GpfkfjService gpfkfjService;
@ApiOperation(value = "扫码获取当前工票的操作附件")
@RequestMapping(value = "/queryFjBybzgx/{bzlx}/{type}")
public void doKwellGpfk(HttpServletRequest request, HttpServletResponse response, @PathVariable String bzlx, @PathVariable String type){
Attachment file = gpfkfjService.queryBzgxFj(bzlx, type);
if(file !=null) {
FileInputStream fileInputStream = attachmentService.download(file.getId());
doAttachmentPreview(file.getId(), response, fileInputStream);
}
}
}
gavel/src/main/java/com/gavel/kwell/controller/KmesBoardController.java
View file @ e8e320f4
......@@ -144,6 +144,18 @@ public class KmesBoardController extends BaseController {
FileInputStream fileInputStream = kmesBoardService.getVideo();
kmesBoardService.doAttachmentPreview(response, fileInputStream);
}
@RequestMapping(value = "/querySafeDays", method = RequestMethod.POST)
@ResponseBody
public Object querySafeDays(@RequestBody JSONObject param) {
return buildReturnData(kmesBoardService.querySafeDays());
}
@RequestMapping(value = "/queryCurProZtsl", method = RequestMethod.POST)
@ResponseBody
public Object queryCurProZtsl(@RequestBody JSONObject param) {
return buildReturnData(kmesBoardService.queryCurrentMadeZtsl());
}
......
gavel/src/main/java/com/gavel/kwell/dao/KmesBoardDao.java
View file @ e8e320f4
......@@ -20,4 +20,6 @@ public interface KmesBoardDao extends BaseDao {
public List<UWoVO> queryWo();
public UWoVO queryWorkingWO();
public int queryZtsl(String[] fkids);
}
gavel/src/main/java/com/gavel/kwell/dao/impl/KmesBoardDaoImpl.java
View file @ e8e320f4
......@@ -82,4 +82,28 @@ public class KmesBoardDaoImpl extends BaseDaoImpl implements KmesBoardDao {
sqlMap.append(" ) ");
return sqlMap.queryEntity(UWoVO.class);
}
@Override
public int queryZtsl(String[] fkids) {
SqlMap sqlMap = new SqlMap();
sqlMap.append(" select sum(a.sl) from ");
sqlMap.append(" (select count(1) sl,bzgx_id bzgx from gpfk ");
sqlMap.append(" left join wogylx on wogylx_id = gpfk_fkgx ");
sqlMap.append(" left join bzgx on bzgx_id = WOGYLX_BZGXID ");
sqlMap.append(" group by bzgx_id) a ");
sqlMap.append(" where 1=1 ");
if(fkids!=null&&fkids.length>0) {
sqlMap.append(" and ( ");
for(int i=0;i<fkids.length;i++) {
if(i<fkids.length-1) {
sqlMap.append(" a.bzgx= '"+fkids[i]+"' or");
}
else {
sqlMap.append(" a.bzgx= '"+fkids[i]+"'");
}
}
sqlMap.append(" ) ");
}
return sqlMap.queryInt();
}
}
gavel/src/main/java/com/gavel/kwell/service/GpfkfjService.java 0 → 100644
View file @ e8e320f4
package com.gavel.kwell.service;
import com.gavel.common.attachment.persistent.Attachment;
import com.gavel.common.base.service.BaseEditService;
public interface GpfkfjService extends BaseEditService {
public Attachment queryBzgxFj(String bzgxid,String type);
}
gavel/src/main/java/com/gavel/kwell/service/KmesBoardService.java
View file @ e8e320f4
......@@ -2,6 +2,7 @@ package com.gavel.kwell.service;
import java.io.FileInputStream;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
......@@ -35,4 +36,9 @@ public interface KmesBoardService extends BaseEditService {
public FileInputStream downloadFile(String path);
public void doAttachmentPreview(HttpServletResponse response, FileInputStream fileInputStream);
/**查询安全生产天数 */
public int querySafeDays();
/**查询在制品状态 */
public Map<String,Object> queryCurrentMadeZtsl();
}
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkfjServiceImpl.java 0 → 100644
View file @ e8e320f4
package com.gavel.kwell.service.impl;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.gavel.common.attachment.persistent.Attachment;
import com.gavel.common.attachment.service.AttachmentService;
import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.gygl.dao.BzgxDao;
import com.gavel.gygl.persistent.Bzgx;
import com.gavel.kwell.service.GpfkfjService;
@Service("gpfkfjService")
@Transactional
public class GpfkfjServiceImpl extends BaseEditServiceImpl implements GpfkfjService {
@Autowired
private AttachmentService attachmentService;
@Autowired
private BzgxDao bzgxDao;
private static final String ZDS1_FLODER="bzgx\\gyzyzdso";
private static final String ZDS2_FLODER="bzgx\\gyzyzdss";
private static final String SP_FLODER="bzgx\\gyzyzdssp";
private static final String ZDS1_BZ="O";
private static final String ZDS2_BZ="T";
private static final String SP_BZ="M";
@Override
public void initService() {
}
@Override
public Attachment queryBzgxFj(String bzgxid,String type) {
Bzgx bzgxVo = bzgxDao.queryById(Bzgx.class, bzgxid);
if(bzgxVo!=null&&StringUtils.isNotEmpty(type)) {
if(type.equals(ZDS1_BZ)) {
List<Attachment> list =attachmentService.getAttachmentAndSubFolder(bzgxVo.getId(), ZDS1_FLODER);
if(list!=null&&list.size()>0) {
return list.get(0);
}
}
else if(type.equals(ZDS2_BZ)) {
List<Attachment> list =attachmentService.getAttachmentAndSubFolder(bzgxVo.getId(), ZDS2_FLODER);
if(list!=null&&list.size()>0) {
return list.get(0);
}
}
else if(type.equals(SP_BZ)) {
List<Attachment> list =attachmentService.getAttachmentAndSubFolder(bzgxVo.getId(), SP_FLODER);
if(list!=null&&list.size()>0) {
return list.get(0);
}
}
}
return null;
}
}
gavel/src/main/java/com/gavel/kwell/service/impl/KmesBoardServiceImpl.java
View file @ e8e320f4
......@@ -17,6 +17,8 @@ import com.gavel.kwell.vo.PcslVO;
import com.gavel.kwell.vo.SdclVO;
import com.gavel.kwell.vo.UWoVO;
import com.gavel.wo.persistent.Pcjhmx;
import org.apache.commons.collections.ListUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,7 +30,9 @@ import java.io.*;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service("kmesBoardService")
......@@ -43,7 +47,7 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
@Autowired
private GpfkcxDao gpfkcxDao;
@Autowired
private CommonService commonService;
......@@ -212,4 +216,50 @@ public class KmesBoardServiceImpl extends BaseEditServiceImpl implements KmesBoa
}
@Override
public int querySafeDays() {
String kgrqStr =commonService.getStringOptionValue(KwellParamEnum.DASHBOARD_KGRQ.getId());
if(StringUtils.isNotEmpty(kgrqStr)) {
Date kgrq = DateUtils.parseDate(kgrqStr);
return DateUtils.betweenDay(kgrq, DateUtils.getDateTime());
}
return 0;
}
@Override
public Map<String, Object> queryCurrentMadeZtsl() {
Map<String, Object> maps = new HashMap<String, Object>();
int zpcount =0;
int cecount =0;
int lhcount =0;
int jycount =0;
String zpztIdsStr =commonService.getStringOptionValue(KwellParamEnum.DASHBOARD_ZPZT.getId());
String ceztIdsStr =commonService.getStringOptionValue(KwellParamEnum.DASHBOARD_CEZT.getId());
String lhztIdsStr =commonService.getStringOptionValue(KwellParamEnum.DASHBOARD_LHZT.getId());
String jyztIdsStr =commonService.getStringOptionValue(KwellParamEnum.DASHBOARD_JYZT.getId());
if(StringUtils.isNotEmpty(zpztIdsStr)) {
String[] zpids = zpztIdsStr.split(",");
zpcount = kmesBoardDao.queryZtsl(zpids);
}
if(StringUtils.isNotEmpty(ceztIdsStr)) {
String[] ceids = ceztIdsStr.split(",");
cecount = kmesBoardDao.queryZtsl(ceids);
}
if(StringUtils.isNotEmpty(lhztIdsStr)) {
String[] lhids = zpztIdsStr.split(",");
lhcount = kmesBoardDao.queryZtsl(lhids);
}
if(StringUtils.isNotEmpty(jyztIdsStr)) {
String[] jyids = zpztIdsStr.split(",");
jycount = kmesBoardDao.queryZtsl(jyids);
}
maps.put(KwellParamEnum.DASHBOARD_ZPZT.getId(), zpcount);
maps.put(KwellParamEnum.DASHBOARD_CEZT.getId(), cecount);
maps.put(KwellParamEnum.DASHBOARD_LHZT.getId(), lhcount);
maps.put(KwellParamEnum.DASHBOARD_JYZT.getId(), jycount);
return maps;
}
}
gavel/src/main/java/com/gavel/kwell/utils/KwellParamEnum.java
View file @ e8e320f4
......@@ -9,6 +9,15 @@ import java.util.List;
@GavelParams("901000000")
public enum KwellParamEnum {
DASHBOARD_KGRQ("KWELL006", "安全开工日期", "B", "安全开工日期", "S","", "2022-03-11", "日期格式为XXXX-XX-XX （年-月-日）"),
DASHBOARD_ZPZT("KWELL002", "在制品装配工序设置", "B", "在制品装配工序设置", "E",
"select BZGX_ID as ID, BZGX_CODE as CODE,CONCAT(BZGX_NAME,'--',isnull(GZZX_NAME,'')) as NAME from BZGX left join GZZX on GZZX_ID = BZGX_GZZXID where isnull(BZGX_TYBZ,'N')='N' order by BZGX_CODE", "", ""),
DASHBOARD_CEZT("KWELL003", "在制品测试工序设置", "B", "在制品测试工序设置", "E",
"select BZGX_ID as ID, BZGX_CODE as CODE,CONCAT(BZGX_NAME,'--',isnull(GZZX_NAME,'')) as NAME from BZGX left join GZZX on GZZX_ID = BZGX_GZZXID where isnull(BZGX_TYBZ,'N')='N' order by BZGX_CODE", "", ""),
DASHBOARD_LHZT("KWELL004", "在制品老化工序设置", "B", "在制品老化工序设置", "E",
"select BZGX_ID as ID, BZGX_CODE as CODE,CONCAT(BZGX_NAME,'--',isnull(GZZX_NAME,'')) as NAME from BZGX left join GZZX on GZZX_ID = BZGX_GZZXID where isnull(BZGX_TYBZ,'N')='N' order by BZGX_CODE", "", ""),
DASHBOARD_JYZT("KWELL005", "在制品检验工序设置", "B", "在制品检验工序设置", "E",
"select BZGX_ID as ID, BZGX_CODE as CODE,CONCAT(BZGX_NAME,'--',isnull(GZZX_NAME,'')) as NAME from BZGX left join GZZX on GZZX_ID = BZGX_GZZXID where isnull(BZGX_TYBZ,'N')='N' order by BZGX_CODE", "", ""),
DASHBOARD_HGL("KWELL001", "合格率按检验工序设置", "B", "合格率按检验工序设置", "E",
"select BZGX_ID as ID, BZGX_CODE as CODE,CONCAT(BZGX_NAME,'--',isnull(GZZX_NAME,'')) as NAME from BZGX left join GZZX on GZZX_ID = BZGX_GZZXID where isnull(BZGX_TYBZ,'N')='N' and BZGX_GXLX = 'JY' order by BZGX_CODE", "", ""),
DASHBORAD_PDF("PDF","配置大屏看板PDF文件路径", "B", "配置大屏看板PDF文件路径", "S", "", "D:\\projectinfo\\kwell-mes\\gavel\\src\\main\\resources\\static\\pdf\\dashboard.pdf", ""),
......
gavel/src/main/resources/templates/views/bom/bom/edit.html deleted 100644 → 0
View file @ 3033f611
<div id="bomBomEdit" class="e-dialog-container" data-options="width:720,height:320">
<div class="e-single-dialog">
<input type="hidden" name="flag">
<input type="hidden" name="id" >
<input type="hidden" name="xh" >
<input type="hidden" name="bomid" >
<!-- <div class="gui-row" style="display: none">
<div class="gui-col-sm12">
<label class="gui-form-label">产品结构：</label>
<div class="gui-input-block">
<input type="text" name="bomid" data-toggle="gui-textbox" data-options="required:true" disabled >
</div>
</div>
</div>-->
<div class="gui-row">
<div class="gui-col-sm6" >
<label class="gui-form-label">物料：</label>
<div class="gui-input-block">
<input type="text" name="wlid" data-toggle="gui-textbox" data-title="wlxxName" data-options="required:true" >
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">单位用量：</label>
<div class="gui-input-block">
<input type="text" name="dwyl" data-toggle="gui-textbox" data-options="required:true" >
</div>
</div>
</div>
<div class="gui-row" >
<!-- <div class="gui-col-sm4">
<label class="gui-form-label">工厂：</label>
<div class="gui-input-block">
<input type="text" name="gcid" data-toggle="gui-textbox" >
</div>
</div>-->
<!-- <div class="gui-col-sm4">
<label class="gui-form-label">序号：</label>
<div class="gui-input-block">
<input type="text" name="xh" data-toggle="gui-textbox" data-options="" >
</div>
</div>-->
</div>
<div class="gui-row" >
<div class="gui-col-sm6">
<label class="gui-form-label">损耗率：</label>
<div class="gui-input-block">
<input type="text" name="shl" data-toggle="gui-textbox" data-options="" >
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">损耗值：</label>
<div class="gui-input-block">
<input type="text" name="shz" data-toggle="gui-textbox" data-options="" >
</div>
</div>
</div>
<div class="gui-row">
<div class="gui-col-sm6">
<label class="gui-form-label">发放原则：</label>
<div class="gui-input-block">
<input type="text" name="ffyz" data-toggle="gui-textbox" data-options="required:true" >
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">发放工序：</label>
<div class="gui-input-block">
<input type="text" name="ffgx" data-toggle="gui-textbox" data-title="gylxName" data-options="" >
<input type="hidden" name="gylxName">
</div>
</div>
</div>
<div class="gui-row" >
<div class="gui-col-sm12">
<label class="gui-form-label">备注：</label>
<div class="gui-input-block">
<input type="text" name="bz" data-toggle="gui-textbox" data-options="" >
</div>
</div>
</div>
</div>
<div class="e-dialog-footer">
<a href="javascript:void(0);" class="e-dialog-ok"></a>
<a href="javascript:void(0);" class="e-dialog-cancel"></a>
</div>
</div>
<script>
$(function () {
var $dialog=$('#bomBomEdit');
var $edtbomid=$dialog.find("input[name='bomid']");
var $edtWlid=$dialog.find("input[name='wlid']");
var $edtFfgx=$dialog.find("input[name='ffgx']");
var $edtFfyz=$dialog.find("input[name='ffyz']");
var $inputXh=$dialog.find("input[name='xh']");
var parmas=$dialog.parent().dialog("options").params;
var xh=parmas.xh;
var tag=$dialog.closest("form").attr("tag");
function paramsInit(){
}
function pageInit(){
$edtFfyz.iCombobox({valueField:'id', textField:'name',allowNull:false, allowEdit:false});
if(tag=="add"){
$edtbomid.val(parmas.bomid);
}
Auxiliary.box($edtWlid,{code:'WLID'});
Auxiliary.box($edtFfgx,{code:'FFGX',onBeforeLoad:function(){
return {wlid:$edtbomid.val()};
}});
}
function dataInit(ops) {
gas.postHTTP("bom/bom/init/ffyz",{},function (res) {
if(res.success){
$edtFfyz.combobox("loadData",res.data.records||[])
}
}, ops);
$inputXh.val(xh);
}
function run(){
}
gas.load(paramsInit,pageInit,dataInit,run);
$dialog.find(".e-dialog-ok").iMenubutton({
text:"确定",
iconCls:"fa fa-save",
btnCls:"gui-btn-save",
onClick:function (){
var data=DataBind.collectData($dialog);
var queryUrl="bom/bom/add";
if(tag=='add'){
HTTP.post(queryUrl,{master:data},function (res) {
if(res.success){
$dialog.closest(".panel-body").iDialog("setStatus",{"state":"ok",data:{
data:$.extend({},data,{
id:res.data.id,
bomid:data.bomid,
wlid:data.wlid
}),
type:tag
}});
gas.showTips("操作成功")
}else{
gas.showWarning(res,"操作失败")
}
})
}else if(tag=="edit"){
queryUrl="bom/bom/update";
HTTP.post(queryUrl,{master:data},function (res) {
if(res.success){
$dialog.closest(".panel-body").iDialog("setStatus",{"state":"ok",data:{
data:data,
type:tag
}});
gas.showTips("操作成功");
}else{
gas.showWarning(res,"操作失败")
}
})
}
}
});
})
</script>
\ No newline at end of file
gavel/src/main/resources/templates/views/bom/bom/index.html deleted 100644 → 0
View file @ 3033f611
<div id="bomBom" class="gui-div">
<table class="toolbar-table" data-options="id: 'bomBomTable',herf:'kzzx/gridset/query'"></table>
<!-- 表格工具栏开始 -->
<div id="bomBomTable-toolbar" class="gui-toolbar" data-options="grid:{type:'treegrid',id:'bomBomTable'}">
<div class="navbar-toolbar">
<a class="toolbar-print toolbar" href="javascript:void(0)"></a>
<a class="toolbar-export toolbar" href="javascript:void(0)"></a>
<a class="toolbar-review toolbar" href="javascript:void(0)"></a>
<a class="toolbar-add toolbar" href="javascript:void(0)" ></a>
<a class="toolbar-edit toolbar" href="javascript:void(0)"></a>
<a class="toolbar-deleteNode toolbar" href="javascript:void(0)"></a>
<a class="toolbar-moveup toolbar" href="javascript:void(0)"></a>
<a class="toolbar-movedown toolbar" href="javascript:void(0)"></a>
</div>
<div class="form-sub">
<form class="query-criteria">
<ul>
<li class="gui-form-row">
<!--<div class="gui-col-sm4">
<label class="gui-form-label">工厂：</label>
<div class="gui-input-block">
<input type="text" name="gcid" class="gui-textbox">
</div>
</div>-->
<div class="gui-col-sm4">
<label class="gui-form-label">产品结构号：</label>
<div class="gui-input-block">
<input type="text" name="bomid" class="gui-textbox">
</div>
</div>
</li>
</ul>
<span class="toolbar-search-span"><a id="bomsearch" class="toolbar-search" href="javascript:void(0)"></a></span>
</form>
</div>
</div>
</div>
<!-- 表格工具栏结束 -->
<script>
$(function () {
/*js初始化*/
var opentype="add";
var $add=$(".toolbar-add")
var $edit=$(".toolbar-edit")
var $div=$('#bomBom');
var $datagrid=$div.find(".toolbar-table");
var $edtBomid=$div.find('input[name="bomid"]');
var $wlsxColumns=[];
var xh=10;
var vidTotal=0;
var $typeMap={};
var theDataPool=[];
let expandedKeys = [] //是一个树结构的数据
function paramInit(ops){
initWlsxColumns($wlsxColumns);
gas.postHTTP("bom/bom/init/ffyz",{},function (res) {
if(res.success){
var data=res['data']['records'];
for(var i in data){
$typeMap[data[i].id]=data[i].name
}
}
}, ops);
}
function pageInit() {
var options = {
url: 'bom/bom',
noRequest: true,
columns: [[
{title: "物料编码", field: "wlxxCode", fieldType: "ftString",width:140},
{title: "物料名称", field: "wlxxName", fieldType: "ftString",width:160},
{title: "单位用量", field: "dwyl", fieldType: "float"},
{title: "损耗率", field: "shl", fieldType: "float"},
{title: "损耗值", field: "shz", fieldType: "float"},
{title: "发放原则", field: "ffyz", fieldType: "ftString",width:80, formatter: function (value, index, row) {
var text = $typeMap[value];
return text || "";
}},
{title: "发放工序", field: "gylxName", fieldType: "ftString",width:140},
{title: "备注", field: "bz", fieldType: "ftString",width:240},
{title: "状态", field: "tybz", fieldType: "ftString",width:80},
{title: "停用日期", field: "tyrq", fieldType: "ftDateTime"},
{title: "维护人", field: "whr", fieldType: "ftString"},
{title: "维护时间", field: "whsj", fieldType: "ftDateTime"}
].concat($wlsxColumns)],
type:"treegrid",
treeOption:{
idField:'vid',
treeField:'wlxxCode',
fitColumns:false,
rownumbers:true,
onLoadSuccess: function(row){
$(this).treegrid('enableDnd', row?row.vid:null);
},
onStopDrag:function (a,b) {
},
onBeforeDrop:function (targetRow, sourceRow, point) {
var bomid=targetRow["wlid"];
var vid=targetRow["vid"];
var targetVid=sourceRow["vid"];
sourceRow["bomid"]=bomid;
if(point=="append"){
appendNode(sourceRow,targetVid,targetRow)
}
},
onDragLeave:function (targetRow, sourceRow) {
}
},
delimitingRun:run,
dialog: {
footerIn: true,
href: 'bom/bom/edit',
onBeforeLoad:function () {
var selectedRow=$datagrid.treegrid("getSelected");
var children=$datagrid.treegrid("getChildren",selectedRow.vid);
if(children.length>0){
xh=parseFloat(children[children.length-1]["xh"])+10
}
$(this).dialog("options").params={
bomid:selectedRow?selectedRow.wlid:"",
xh:xh
}
},
onSaveCallback:function (el,params) {
var data=params["data"];
var saveType=params["type"]
var selectedNode=$datagrid.treegrid("getSelected");
expandedKeys=[];
setName($datagrid.treegrid("getData"));
var treeData=[...expandedKeys];
var wlxxData=[];
$("#bomsearch").click()
if(saveType=="add"){
/*新增回调*/
gas.post("bom/bom/query",{bomid: data.bomid},function (res) {
if(res.success){
wlxxData=[...res.data.records];
wlxxData[0]=$.extend(wlxxData[0],data);
var rows=findFormWlid(treeData,data.bomid);
$.each(rows,function (i,item) {
var wlxxRoot=buildTree(wlxxData,data.bomid);
$datagrid.treegrid("append",{
parent:item.vid,
data:[...wlxxRoot]
});
$datagrid.treegrid("refresh",item.vid);
});
$datagrid.treegrid('enableDnd',null);
}else{
gas.showError(res, "查询失败")
}
})
}else if(saveType=="edit"){
gas.post("bom/bom/query",{bomid: data.bomid},function (res) {
if(res.success){
wlxxData=[...res.data.records];
wlxxData[0]=$.extend(wlxxData[0],data);
var rows=findFormId(treeData,selectedNode.id);
$.each(rows,function (i,item) {
var wlxxRoot=buildTree(wlxxData,data.bomid);
var children=$datagrid.treegrid("getChildren",item.vid);
$.each(children,function (i,item) {
$datagrid.treegrid("remove",item.vid)
});
$datagrid.treegrid("update",{
id: item.vid,
row:wlxxRoot[0]
});
$datagrid.treegrid("refresh",item.vid);
if(wlxxRoot[0]["children"]&&wlxxRoot[0]["children"].length>0){
$datagrid.treegrid("append",{
parent: item.vid,
data:[...wlxxRoot[0]["children"]]
});
}
});
}else{
gas.showError(res, "查询失败!")
}
})
}
},
messager:function (e) {
var selectedRow=$datagrid.treegrid("getSelected");
if(!selectedRow){
gas.showWarning("请选择一条数据!");
return true
}
if(selectedRow.bomid=="root"&&opentype=="edit"){
gas.showWarning("无法操作根节点!");
return true
}else{
HTTP.post('editValue',{id:selectedRow.bomid},function (result) {
if(result["success"]){
var data=result.data.records
}else{
gas.showWarning("无法操作根节点!");
return true
}
})
}
}
}
};
$edit.click(function(){
opentype="edit"
})
$add.click(function(){
opentype="add"
})
$div.Holder(options);
Auxiliary.box($edtBomid,{code:'WLID',callback:function (res) {
$edtBomid.textbox("setValue",res.id);
$edtBomid.textbox("setText",res.name);
run()
}});
$div.find(".toolbar-moveup").iMenubutton({
iconCls: 'fa fa-long-arrow-up',
text:'上移',
onClick:bomMoveUp
});
$div.find(".toolbar-movedown").iMenubutton({
iconCls: 'fa fa-long-arrow-up',
text:'下移',
onClick:bomMoveDown
});
$div.find(".toolbar-deleteNode").iMenubutton({
iconCls:"fa fa-trash",
text:"删除",
onClick:bomDelete
})
}
function bomMoveUp() {
var n = $datagrid.treegrid("getSelected");if(n==null){gas.showWarning("无法移动！");return;}
var parentNode=$datagrid.treegrid("getParent",n.vid);
var index=parentNode.children.findIndex(function(item) {
return item.vid==n.vid
});
if(index==0) {gas.showWarning("无法移动！");return;}
HTTP.post('bom/bom/moveup',{id:n.id},function (result) {
if(result.success){
expandedKeys=[];
setName($datagrid.treegrid("getData"));
var treeData=[...expandedKeys];
var preId =parentNode["children"][index-1]["vid"];
var n2 = $datagrid.treegrid("pop",n.vid);
$datagrid.treegrid("insert",{before:preId,data:n2});
$datagrid.treegrid("select",n.vid);
var rows=findFormId(treeData,n.id);
$.each(rows,function (i,row) {
if(row.vid!=n.vid){
replaceMoveup($div,row.vid)
}
})
}else{
gas.showError(result, "操作失败");
}
})
}
function replaceMoveup($div,vid) {
var parentNode=$datagrid.treegrid("getParent",vid);
var index=parentNode.children.findIndex(function(item) {
return item.vid==vid
});
var preId =parentNode["children"][index-1]["vid"];
var n2 = $datagrid.treegrid("pop",vid);
$datagrid.treegrid("insert",{before:preId,data:n2});
}
function replaceMovedown($div,vid) {
var parentNode=$datagrid.treegrid("getParent",vid);
var index=parentNode.children.findIndex(function(item) {
return item.vid==vid
});
var preId =parentNode["children"][index+1]["vid"];
var n2 = $datagrid.treegrid("pop",preId);
$datagrid.treegrid("insert",{before:vid,data:n2});
}
function bomMoveDown() {
var n = $datagrid.treegrid("getSelected");if(n==null){gas.showWarning("无法移动！");return;}
var s=$datagrid.prev().find('.datagrid-btable:eq(0) tr:eq(0)').attr('id'),
id=s.substring(0,s.length - 1);
var parentNode=$datagrid.treegrid("getParent",n.vid);
var index=parentNode.children.findIndex(function(item) {
return item.vid==n.vid
});
if(index==parentNode.children.length-1) {gas.showWarning("无法移动！");return;}
HTTP.post('bom/bom/movedown',{id:n.id},function (result) {
if(result.success){
expandedKeys=[];
setName($datagrid.treegrid("getData"));
var treeData=[...expandedKeys];
var preId =parentNode["children"][index+1]["vid"];
var n2 = $datagrid.treegrid("pop",preId);
$datagrid.treegrid("insert",{before:n.vid,data:n2});
$datagrid.treegrid("select",n.vid);
var rows=findFormId(treeData,n.id);
$.each(rows,function (i,row) {
if(row.vid!=n.vid){
replaceMovedown($div,row.vid)
}
})
}else{
gas.showError(result, "操作失败!");
}
})
}
function bomDelete() {
var selectedNode = $datagrid.treegrid("getSelected");
if(!selectedNode){
gas.showWarning("请选择一条数据进行删除操作!");
return false
}
if(selectedNode.bomid=="root"){
gas.showWarning("产品结构不允许删除!");
return false
}
var s=$datagrid.prev().find('.datagrid-btable:eq(0) tr:eq(0)').attr('id'),
id=s.substring(0,s.length - 1);
var selectRow = $div.find('#'+id+selectedNode.vid);
var cloestEl=selectRow.closest(".treegrid-tr-tree").siblings("tr[node-id]");
var parentVid=null;
if(cloestEl){
parentVid=cloestEl.attr("node-id");
}
gas.confirm("是否删除该节点及其子结构",function (r) {
if(r){
gas.post("bom/bom/delete",{id:selectedNode.id},function (res) {
if(res.success){
expandedKeys=[];
setName($datagrid.treegrid("getData"));
var treeData=[...expandedKeys];
var rows=findFormWlid(treeData,selectedNode.wlid);
$.each(rows,function (i,item) {
if(item.id==selectedNode.id){
$datagrid.treegrid("remove",item.vid);
}
});
if(parentVid){
$datagrid.treegrid("select",parentVid);
// $datagrid.treegrid("refresh",parentVid);
}
}else{
gas.showError(res, "删除失败!");
}
})
}
})
}
/*拖拽添加节点*/
function appendNode(data,vid,target){
expandedKeys=[];
setName($datagrid.treegrid("getData"));
var treeData=[...expandedKeys];
var wlxxData=[];
gas.post("bom/bom/query",{bomid: data.wlid},function (res) {
if(res.success){
wlxxData=[...res.data.records];
wlxxData[0]=$.extend(wlxxData[0],data);
var rows=findFormWlid(treeData,data.bomid);
var oldTarget=findFormWlid(treeData,data.wlid);
$.each(oldTarget,function (i,item) {
if(item.vid!=vid){
$datagrid.treegrid("remove",item.vid);
}
});
$.each(rows,function (i,item) {
if(item.vid!=target.vid){
var wlxxRoot=buildTree(wlxxData,data.bomid);
$datagrid.treegrid("append",{
parent:item.vid,
data:[...wlxxRoot]
});
$datagrid.treegrid("refresh",item.vid);
}
});
$datagrid.treegrid('enableDnd',null);
gas.post("bom/bom/moveParent",{
id:data.id,
pid:target.id,
bomid:target.wlid
},function (response) {
if(response.success){
gas.showMessage(response, "操作成功!")
}else{
gas.showError(response, "操作失败!")
}
})
}
})
}
/*数据初始化*/
function dataInit(ops){
}
/*用户操作*/
function run(){
vidTotal=0;
HTTP.post("bom/bom/query",DataBind.collectData($div),function (res) {
if(res.success){
var rows=res.data.records;
theDataPool=[];
var data2 = {total:rows.length,"rows":buildTree(rows,"root")};
$datagrid.treegrid('loadData', data2);
}else{
gas.showError(res, "请求失败");
}
});
}
function transDataChildren(a, idStr, pidStr, chindrenStr){
var r = [], hash = {}, id = idStr, pid = pidStr, children = chindrenStr, i = 0, j = 0, len = a.length;
for(; i < len; i++){
hash[a[i][id]] = a[i];
}
for(; j < len; j++){
var aVal = a[j], hashVP = hash[aVal[pid]];
if(hashVP){
!hashVP[children] && (hashVP[children] = []);
hashVP[children].push(aVal);
// hashVP["state"]="closed"
}else{
r.push(aVal);
}
}
return r;
}
//递归
function buildTree(data,bomid){
var list=findFormData(data,bomid);
var itemArr=[];
for(var i=0;i<list.length;i++){
var item=list[i];
var child={};
vidTotal++;
if(item.wlid=="root"){
item["vid"]="root"
}
child=$.extend({},item,{vid:vidTotal});
child["children"]=buildTree(data,item.wlid);
$.each(child["children"],function (a,b) {
b["_parentId"]=child["vid"]
});
itemArr.push(child);
}
return itemArr
}
function findFormData(data,bomid){
var arry=[];
$.each(data,function (i,item) {
if(item.bomid==bomid){
arry.push(item)
}
});
return arry
}
function findFormWlid(data,wlid){
var arry=[];
$.each(data,function (i,item) {
if(item.wlid==wlid){
arry.push(item)
}
});
return arry
}
function findFormId(data,id) {
var arry=[];
$.each(data,function (i,item) {
if(item.id==id){
arry.push(item)
}
});
return arry
}
function setName(datas){ //遍历树 获取id数组
$.each(datas,function (i,item) {
expandedKeys.push(datas[i])
if(datas[i].children&&datas[i].children.length>0){
setName(datas[i].children);
}
})
}
gas.load(paramInit,pageInit,dataInit);
});
</script>
gavel/src/main/resources/templates/views/gygl/bzgx/edit.html 0 → 100644
View file @ e8e320f4
<div id="gyglBzgxEdit" class="e-dialog-container" data-options="width:800,height:420">
<div class="editTable">
<input type="hidden" name="flag">
<input type="hidden" name="id" >
<div class="gui-row" >
<div class="gui-col-sm6">
<label class="gui-form-label">工序编码：</label>
<div class="gui-input-block">
<input type="text" name="code" data-toggle="gui-textbox" data-options="required:true,fieldType:'upper'">
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">名称：</label>
<div class="gui-input-block">
<input type="text" name="name" data-toggle="gui-textbox" data-options="required:true">
</div>
</div>
</div>
<div class="gui-row" >
<!-- <div class="gui-col-sm6">
<label class="gui-form-label">工厂：</label>
<div class="gui-input-block">
<input type="text" name="gcid" data-toggle="gui-textbox" data-options="required:true">
</div>
</div> -->
<div class="gui-col-sm6">
<label class="gui-form-label">工作中心：</label>
<div class="gui-input-block">
<input type="text" name="gzzxid" data-toggle="gui-textbox" data-options="required:true">
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">工序类型：</label>
<div class="gui-input-block">
<input type="text" name="gxlx" data-toggle="gui-textbox" data-options="">
</div>
</div>
</div>
<div class="gui-row" >
<div class="gui-col-sm6">
<div class="gui-input-block" data-toggle="gui-checkbox" data-options="label:'关键工序',labelPosition:'right'">
<input type="checkbox" name="gjgx" >
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">加工顺序：</label>
<div class="gui-input-block">
<input type="text" name="xh" data-toggle="gui-numberbox">
</div>
</div>
</div>
<div class="gui-row" >
<div class="gui-col-sm6">
<label class="gui-form-label">设备数量：</label>
<div class="gui-input-block">
<input type="text" name="sbsl" data-toggle="gui-numberbox">
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">作业人数：</label>
<div class="gui-input-block">
<input type="text" name="zyrsl" data-toggle="gui-numberbox" data-options="">
</div>
</div>
</div>
<div class="gui-row" >
<div class="gui-col-sm6">
<label class="gui-form-label">排队耗时(小时)：</label>
<div class="gui-input-block">
<input type="text" name="pdhs" data-toggle="gui-numberbox" data-options="">
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">准备耗时(分钟)：</label>
<div class="gui-input-block">
<input type="text" name="zbhs" data-toggle="gui-numberbox" data-options="">
</div>
</div>
</div>
<div class="gui-row" >
<div class="gui-col-sm6">
<label class="gui-form-label">加工耗时(分钟)：</label>
<div class="gui-input-block">
<input type="text" name="jghs" data-toggle="gui-numberbox" data-options="">
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">转移耗时(小时)：</label>
<div class="gui-input-block">
<input type="text" name="zyhs" data-toggle="gui-numberbox" data-options="">
</div>
</div>
</div>
<div class="gui-row" >
<div class="gui-col-sm12">
<label class="gui-form-label">备注：</label>
<div class="gui-input-block">
<input type="text" name="bz" data-toggle="gui-textbox" data-options="">
</div>
</div>
</div>
</div>
<div class="e-dialog-footer">
<a href="javascript:void(0);" class="e-dialog-ok"></a>
<a href="javascript:void(0);" class="e-dialog-cancel"></a>
</div>
</div>
<script>
$(function () {
var $div=$('#gyglBzgxEdit');
//新增初始化
if( $div.closest("form").attr("tag")=="add"){
$div.find("input[name='sbsl']").val(1);
}
$div.find("input[name='gcid']").iCombobox(
{url: 'jcsj/gc/query',valueField: 'id', textField: 'name', allowNull:false,
loadFilter: function (a) {
return a["data"]["records"]
}
}
);
$div.find("input[name='gzzxid']").iCombobox(
{url: 'gygl/gzzx/query',valueField: 'id', textField: 'name', allowNull:false,
loadFilter: function (a) {
return a["data"]["records"]
}
}
);
$div.find('input[name="gxlx"]').iCombobox({
url: 'gygl/bzgx/init/gxlx', valueField: 'id', textField: 'name',allowNull:false,
loadFilter: function (a) {return a["data"]["records"]}
});
})
</script>
gavel/src/main/resources/templates/views/gygl/bzgx/index.html 0 → 100644
View file @ e8e320f4
<div id="gyglBzgx" class="gui-div">
<table class="toolbar-table" data-options="id: 'gyglBzgxTable',herf:'kzzx/gridset/query'"></table>
<!-- 表格工具栏开始 -->
<div id="gyglBzgxTable-toolbar" class="gui-toolbar" data-options="grid:{type:'datagrid',id:'gyglBzgxTable'}">
<div class="navbar-toolbar">
<a class="toolbar-print toolbar" href="javascript:void(0)"></a>
<a class="toolbar-export toolbar" href="javascript:void(0)"></a>
<a class="toolbar-review toolbar" href="javascript:void(0)"></a>
<a class="toolbar-add toolbar" href="javascript:void(0)"></a>
<a class="toolbar-copy toolbar" href="javascript:void(0)"></a>
<a class="toolbar-edit toolbar" href="javascript:void(0)"></a>
<a class="toolbar-delete toolbar" href="javascript:void(0)"></a>
<a class="toolbar-attachment toolbar" href="javascript:void(0)"></a>
<a class="toolbar-run toolbar" href="javascript:void(0)"></a>
</div>
<div class="form-sub">
<form class="query-criteria">
<ul>
<li class="gui-form-row" >
<div class="gui-col-sm3">
<label class="gui-form-label">工作中心：</label>
<div class="gui-input-block">
<input type="text" name="gzzxid" class="gui-textbox" style="width: 100%">
</div>
</div>
<div class="gui-col-sm3">
<label class="gui-form-label">工序类型：</label>
<div class="gui-input-block">
<input type="text" name="gxlx" class="gui-textbox" style="width: 100%">
</div>
</div>
<div class="gui-col-sm3">
<label class="gui-form-label">工序信息：</label>
<div class="gui-input-block">
<input type="text" name="gxid" class="gui-textbox" style="width: 100%">
</div>
</div>
</li>
</ul>
<span class="toolbar-search-span"><a class="toolbar-search" href="javascript:void(0)"></a></span>
</form>
</div>
</div>
</div>
<!-- 表格工具栏结束 -->
<script>
/*js初始化*/
$(function () {
var $div=$('#gyglBzgx');
var gxlxData={};
var promise= new Promise(function( reslove,reject ) {
HTTP.post('gygl/bzgx/init/gxlx',{},function (result) {
if(result["success"]){
var data=result["data"]["records"]||[];
for(var i in data){
gxlxData[data[i].id]=data[i].name
}
reslove(gxlxData)
}
});
});
$div.find("input[name='gzzxid']").iCombobox(
{url: 'gygl/gzzx/query',valueField: 'id', textField: 'name', allowNull:true,
loadFilter: function (a) {
return a["data"]["records"]
}
}
);
$div.find("input[name='gxlx']").iCombobox(
{url: 'gygl/bzgx/init/gxlx',valueField: 'id', textField: 'name', allowNull:true,
loadFilter: function (a) {
return a["data"]["records"]
}
}
);
promise.then(function(data){
var options={
url:'gygl/bzgx',
queryParams:{
gzzxid: $div.find('form input[name="gzzxid"]').val(),
gxlx: $div.find('form input[name="gxlx"]').val(),
gxid: $div.find('form input[name="gxid"]').val()
},
columns:[[
{title: "工序编码", field: "code", width:120},
{title: "工序名称", field: "name", width:140},
/* {title: "工厂", field: "gcname", width:140}, */
{title: "工作中心", field: "gzzxname", width:140},
{title: "加工顺序", field: "xh", fieldType:"int", width:80},
{title: "设备数量", field: "sbsl", fieldType:"float"},
{title: "作业人数", field: "zyrsl", fieldType:"float"},
{title: "排队耗时(小时)", field: "pdhs", fieldType:"float",width:120},
{title: "准备耗时(分钟)", field: "zbhs", fieldType:"float",width:120},
{title: "加工耗时(分钟)", field: "jghs", fieldType:"float",width:120},
{title: "转移耗时(小时)", field: "zyhs", fieldType:"float",width:120},
{title: "工序类型", field: "gxlx", width:100, formatter: function (value, index, row) {
var text = gxlxData[value];
return text || "";
}
},
{title: "关键工序", field: "gjgx", fieldType:"checkbox",width:90},
{title: "状态", field: "tybz", width:80},
{title: "停用日期", field: "tyrq", fieldType:"ftDateTime"},
{title: "备注", field: "bz", width:200},
{title: "维护人", field: "whr", fieldType:"ftString"},
{title: "维护时间", field: "whsj", fieldType:"ftDateTime"}
]],
dialog:{
footerIn: true,
href:'gygl/bzgx/edit'
}
};
$div.Holder(options);
});
});
</script>
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