Skip to content

K
kwell-mes
Commit 74ec4bb2 authored by yff's avatar yff
Browse files
Options

提交

parent 982cc686
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 44 deletions
gavel/src/main/java/com/gavel/kwell/controller/GpfkController.java
View file @ 74ec4bb2
......@@ -19,6 +19,7 @@ import com.alibaba.fastjson.JSONObject;
import com.gavel.common.BaseURL;
import com.gavel.common.SystemOperation;
import com.gavel.common.annotation.ResourcePermissions;
import com.gavel.common.attachment.persistent.Attachment;
import com.gavel.common.base.BaseEditJSON;
import com.gavel.common.base.controller.BaseController;
import com.gavel.common.converter.DataConvert;
......@@ -276,7 +277,7 @@ public class GpfkController extends BaseController {
setReturnMessage("条码不允许为空！");
return returnData();
}
Gpfk gpfk = gpfkService.queryKwellWosnWithAddGpfk(wosnid, bzlx);
GpfkVO gpfk = gpfkService.queryKwellWosnWithAddGpfk(wosnid, bzlx);
if(gpfk != null){
return buildReturnData(gpfk);
}else{
......@@ -289,11 +290,12 @@ public class GpfkController extends BaseController {
@ResponseBody
public Object getWoBomByWoid(@RequestBody JSONObject param) {
String woid = param.getString("woid");
String bzlx = param.getString("bzlx");
if(StringUtils.isEmpty(woid)){
setReturnMessage("条码不允许为空！");
return returnData();
}
List<WobomVO> wobomVOs= gpfkService.queryWobomByWo(woid);
List<WobomVO> wobomVOs= gpfkService.queryWobomByWo(woid,bzlx);
if(wobomVOs != null){
return buildReturnData(wobomVOs);
}else{
......@@ -304,7 +306,7 @@ public class GpfkController extends BaseController {
@ApiOperation(value = "扫码获取当前工票的操作附件")
@RequestMapping(value = "/queryPdfByWoidAndZpgx/{woid}/{bzlx}")
public void doKwellGpfk(HttpServletRequest request, HttpServletResponse response, @PathVariable String woid, @PathVariable String bzlx){
FilesVO file = gpfkService.queryWoGylxFj(woid, bzlx);
Attachment file = gpfkService.queryWoGylxFj(woid, bzlx);
if(file !=null) {
FileInputStream fileInputStream = attachmentService.download(file.getId());
doAttachmentPreview(file.getId(), response, fileInputStream);
......
gavel/src/main/java/com/gavel/kwell/dao/GpfkDao.java
View file @ 74ec4bb2
......@@ -113,11 +113,11 @@ public interface GpfkDao extends BaseDao {
/**科威尔工票反馈sql */
public HzWoVO queryKwellWoBySnid(String snid);
public List<WobomVO> queryWobomByWo(String snid);
public List<WobomVO> queryWobomByWo(String woid,String bzlx);
public GylxVO queryKwellWoStandGylx(String djid,String bzlx);
public Gpfk queryKwellGpfkByWosnAndGxid(GpfkCondition condition);
public GpfkVO queryKwellGpfkByWosnAndGxid(GpfkCondition condition);
public double queryWobomZpslByDjidAndWlid(String djid,String wlid);
......
gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkDaoImpl.java
View file @ 74ec4bb2
......@@ -1232,22 +1232,28 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
@Override
public List<WobomVO> queryWobomByWo(String djid) {
public List<WobomVO> queryWobomByWo(String woid,String bzlx) {
SqlMap sqlMap = new SqlMap();
sqlMap.append("select WOBOM_ID, WOBOM_XH, WOBOM_WOID, WOBOM_WLID, WOBOM_FFGX,");
sqlMap.append(" WOBOM_DWYL, WOBOM_XQSL, WOBOM_XQRQ, WOBOM_SHL, WOBOM_SHZ, WOBOM_FFYZ,");
sqlMap.append(" WOBOM_LLSL, WOBOM_CKSL, WOBOM_BZ, WOBOM_WHRID, WOBOM_WHR,");
sqlMap.append(" WOBOM_WHSJ, WOBOM_CJRID, WOBOM_CJR, WOBOM_CJSJ, WOBOM_SYSVERSION,");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, WOBOM_GJWL, WOBOM_ZT, WOBOM_DJLY,");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, WOBOM_GJWL, WOBOM_ZT, WOBOM_DJLY,k.ZPSL as ZPSL,");
sqlMap.append(" WOGYLX_XH, WOGYLX_NAME, WOBOM_WLPH ");
sqlMap.append("from WOBOM");
sqlMap.append(" left join WLXX on WLXX_ID = WOBOM_WLID");
sqlMap.append(" left join WO on WO_ID = WOBOM_WOID");
sqlMap.append(" left join WOGYLX on WOGYLX_ID = WOBOM_FFGX ");
sqlMap.append(" left join BZGX on BZGX_ID = WOGYLX_BZGXID ");
sqlMap.append(" left join (select sum(GPHY_ZPSL) as ZPSL,GPHY_MID,GPHY_WLID from GPHY group by GPHY_MID,GPHY_WLID) k on k.GPHY_MID = WO_ID and k.GPHY_WLID = WLXX_ID");
sqlMap.append("where 1=1");
if (StringUtils.isNotEmpty(djid)){
sqlMap.append(" and " + SqlUtil.getWhereSql("WO_DJID", djid));
sqlMap.setParamValue("WO_DJID", djid);
if (StringUtils.isNotEmpty(woid)){
sqlMap.append(" and " + SqlUtil.getWhereSql("WO_ID", woid));
sqlMap.setParamValue("WO_ID", woid);
}
if (StringUtils.isNotEmpty(bzlx)){
sqlMap.append(" and " + SqlUtil.getWhereSql("BZGX_ID", bzlx));
sqlMap.setParamValue("BZGX_ID", bzlx);
}
sqlMap.append("order by WOBOM_XH, WLXX_CODE");
return sqlMap.query(WobomVO.class);
......@@ -1271,24 +1277,23 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.append(" and " + SqlUtil.getWhereSql("WOGYLX_WOID", woid));
sqlMap.setParamValue("WOGYLX_WOID", woid);
}
if (StringUtils.isNotEmpty(woid)){
sqlMap.append(" and " + SqlUtil.getWhereSql("GYLX_BZGXID", bzlx));
sqlMap.setParamValue("GYLX_BZGXID", bzlx);
if (StringUtils.isNotEmpty(bzlx)){
sqlMap.append(" and " + SqlUtil.getWhereSql("WOGYLX_BZGXID", bzlx));
sqlMap.setParamValue("WOGYLX_BZGXID", bzlx);
}
return sqlMap.queryEntity(GylxVO.class);
}
@Override
public Gpfk queryKwellGpfkByWosnAndGxid(GpfkCondition condition){
public GpfkVO queryKwellGpfkByWosnAndGxid(GpfkCondition condition){
SqlMap sqlMap = new SqlMap();
sqlMap.append("select GPFK_ID, GPFK_WOSNID, GPFK_FKLX, GPFK_FKSJ, GPFK_HGBZ, GPFK_FKSL, ");
sqlMap.append(" GPFK_HGSL, GPFK_BHGSL, GPFK_FKR, GPFK_FKGX, GPFK_BZ, ");
sqlMap.append(" GPFK_WHRID, GPFK_WHR, GPFK_WHSJ, GPFK_CJRID, GPFK_CJR, ");
sqlMap.append(" GPFK_CJSJ, GPFK_SYSVERSION, GPFK_FKRID, GPFK_FKBX, GPFK_FKJSSJ, ");
sqlMap.append(" BX_CODE, BX_NAME, BZGX_CODE, BZGX_NAME, ");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, WO_DJID, ");
sqlMap.append(" DATEDIFF(mi,GPFK_FKSJ,GPFK_FKJSSJ) as gxhs, ");
sqlMap.append(" 1GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE");
sqlMap.append(" WLXX_CODE, WLXX_NAME, WLXX_GG, WO_DJID,WO_ID, ");
sqlMap.append(" GPFK_GFSL, GPFK_LFSL, GPFK_FXSL, GPFK_FGSL, GPFK_YWRQ, GPFK_HGDJ, WOSN_KHCODE");
sqlMap.append("from GPFK ");
sqlMap.append(" left join BX on BX_ID = GPFK_FKBX ");
sqlMap.append(" left join WOSN on WOSN_CODE = GPFK_WOSNID ");
......@@ -1325,7 +1330,7 @@ public class GpfkDaoImpl extends BaseDaoImpl implements GpfkDao {
sqlMap.setParamValue("pFKSJE", condition.getEnd());
}
sqlMap.append("order by GPFK_FKSJ desc, GPFK_FKGX ");
return sqlMap.queryEntity(Gpfk.class);
return sqlMap.queryEntity(GpfkVO.class);
}
......
gavel/src/main/java/com/gavel/kwell/service/GpfkService.java
View file @ 74ec4bb2
......@@ -3,6 +3,7 @@ package com.gavel.kwell.service;
import java.util.Date;
import java.util.List;
import com.gavel.common.attachment.persistent.Attachment;
import com.gavel.common.base.service.BaseEditService;
import com.gavel.file.vo.FilesVO;
import com.gavel.gygl.vo.BzgxCondition;
......@@ -92,13 +93,13 @@ public interface GpfkService extends BaseEditService {
public SmCodeModel querySml(String snid);
public List<WobomVO> queryWobomByWo(String snid);
public List<WobomVO> queryWobomByWo(String woid,String bzlx);
public GylxVO queryKwellWoStandGylx(String djid,String bzlx);
public FilesVO queryWoGylxFj(String djid,String bzlx);
public Attachment queryWoGylxFj(String djid,String bzlx);
public Gpfk queryKwellWosnWithAddGpfk(String wosn,String bzlx);
public GpfkVO queryKwellWosnWithAddGpfk(String wosn,String bzlx);
public void jyfk(String fkid,String hgsn);
......
gavel/src/main/java/com/gavel/kwell/service/impl/GpfkServiceImpl.java
View file @ 74ec4bb2
......@@ -15,6 +15,9 @@ import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import com.gavel.common.Constants;
import com.gavel.common.attachment.persistent.Attachment;
import com.gavel.common.attachment.service.AttachmentService;
import com.gavel.common.attachment.vo.AttachmentVO;
import com.gavel.common.base.entity.BaseEntity;
import com.gavel.common.base.service.impl.BaseEditServiceImpl;
import com.gavel.common.business.service.CommonService;
......@@ -64,6 +67,7 @@ import com.gavel.kzzx.vo.UserRoleCondition;
import com.gavel.kzzx.vo.UserRoleVO;
import com.gavel.kzzx.vo.YymkCondition;
import com.gavel.kzzx.vo.YymkVO;
import com.gavel.persistence.entity.EntityDataFactory;
import com.gavel.persistence.sql.RecordSet;
import com.gavel.wo.vo.WobomVO;
......@@ -72,9 +76,6 @@ import com.gavel.wo.vo.WobomVO;
@Transactional
public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService {
private static final String ZP_CODE ="ZP";
private static final String JY_CODE ="JY";
private static final String WX_CODE ="WX";
@Autowired
private GpfkDao gpfkDao;
......@@ -94,6 +95,9 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Autowired
private YymkService yymkService;
@Autowired
private AttachmentService attachmentService;
@Autowired
private UserDao userDao;
......@@ -849,15 +853,15 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
}
@Override
public List<WobomVO> queryWobomByWo(String snid) {
return gpfkDao.queryWobomByWo(snid);
public List<WobomVO> queryWobomByWo(String woid,String bzlx) {
return gpfkDao.queryWobomByWo(woid,bzlx);
}
@Override
public FilesVO queryWoGylxFj(String woid,String bzlx) {
public Attachment queryWoGylxFj(String woid,String bzlx) {
GylxVO gylx = queryKwellWoStandGylx(woid, bzlx);
if(gylx!=null) {
List<FilesVO> list = filesService.queryFileAndSubFolder(gylx.getId());
List<Attachment> list =attachmentService.getAttachmentAndSubFolder(gylx.getId(), "gylx");
if(list!=null&&list.size()>0) {
return list.get(0);
}
......@@ -867,14 +871,14 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
@Override
@Transactional
public Gpfk queryKwellWosnWithAddGpfk(String wosn, String bzlx) {
public GpfkVO queryKwellWosnWithAddGpfk(String wosn, String bzlx) {
GpfkCondition gpfkCondition = new GpfkCondition();
gpfkCondition.setWosnid(wosn);
gpfkCondition.setGxid(bzlx);
Gpfk gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
if(gpfk==null) {
GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
if(gpfkVo==null) {
HzWoVO hzWoVO =queryKwellWoBySnid(wosn);
gpfk = new Gpfk();
Gpfk gpfk = new Gpfk();
gpfk.setWosnid(wosn);
gpfk.setFkgx(bzlx);
gpfk.setFkrid(UserInfoUtil.getId());
......@@ -882,16 +886,18 @@ public class GpfkServiceImpl extends BaseEditServiceImpl implements GpfkService
gpfk.setFksj(DateUtils.getDate());
gpfk.setWlid(hzWoVO.getWlid());
insert(gpfk);
gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
}
return gpfk;
return gpfkVo;
}
@Override
public void jyfk(String fkid, String hgsn) {
GpfkCondition gpfkCondition = new GpfkCondition();
gpfkCondition.setId(fkid);
Gpfk gpfk = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
GpfkVO gpfkVo = gpfkDao.queryKwellGpfkByWosnAndGxid(gpfkCondition);
Gpfk gpfk = new Gpfk();
EntityDataFactory.copyEntity(gpfkVo, gpfk);
if(SmCodeEnum.OKBZ.getId().equals(hgsn)) {
gpfk.setHgsl(gpfk.getHgsl()+1.0);
}
......
gavel/src/main/java/com/gavel/kwell/vo/GpfkVO.java
View file @ 74ec4bb2
......@@ -8,7 +8,6 @@ public class GpfkVO extends Gpfk {
private static final long serialVersionUID = 1L;
private String woid;
@FieldMeta(fieldName = "BX_CODE", caption = "班型编码")
private String bxCode;
......@@ -39,6 +38,9 @@ public class GpfkVO extends Gpfk {
@FieldMeta(fieldName = "WO_DJID", caption = "任务单号")
private String woDjid;
@FieldMeta(fieldName = "WO_ID", caption = "任务id")
private String woid;
@FieldMeta(fieldName = "BZGX_GXLX", caption = "工序类型")
private String bzgxGxlx;
......
gavel/src/main/resources/templates/views/kmes/gphy/index.html
View file @ 74ec4bb2
......@@ -140,7 +140,7 @@
that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid;
that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woDjid;
let woid = res.data.records.woid;
y(woid)
/** wobom查询 **/
......@@ -159,7 +159,7 @@
function zpfk_queryWoBomByWoid(e,woid){
let that=e
that.xlh=""
gas.post('kmes/gpfk/queryWoBomByWoid',{"woid":woid}, function(res){
gas.post('kmes/gpfk/queryWoBomByWoid',{"woid":woid,"bzlx":window.bzlx}, function(res){
if(res.data&&res.data.records){
let msg="查询装配表格:"+woid+"成功"
zpfk_wrz(that,msg)
......@@ -176,13 +176,13 @@
function zpfk_pdfshow(e,woid){
console.log("pdf")
let that=e
let newPdfurl=that.pdfurl+"?woid="+woid+"&&"+"gxid="+window.gxid||"nogxid"
let newpdfurl=that.pdfurl+"/"+woid+"/"+window.bzlx
if (newpdfurl!=that.pdfurl){
that.pdfurl=nowpdfurl
that.pdfurl=newpdfurl
if(that.sivpdf){
clearInterval(that.sivpdf)
}
pdfshow(that.pdfurl, that.pdfdom, 20000).then(e => {
pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
that.sivpdf = e
})
}
......@@ -195,6 +195,7 @@
let msg="正在查询WOSNID:"+that.xlh
zpfk_wrz(that,msg)
zpfk_queryKwellWoinfo(that).then(function(s){
debugger;
zpfk_queryWoBomByWoid(that,s)
zpfk_pdfshow(that,s)
})
......@@ -472,7 +473,6 @@
el: "#kwrkb01",
mounted() {
zpfk_getgx(this)
pdfshow("pdf/dcAcess.pdf","kwrkb01pdf",20000)
this.initpage()
dbenlarge('kwrkb01', 1, this.initpage)
$(this.el).dblclick()
......
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