Skip to content

T
topsun-bpm
Commit 99480eb7 authored by 刘学辉's avatar 刘学辉
Browse files
Options

采购信息记录编辑方式调整

parent 983e71b7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 411 additions and 99 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.jsp
View file @ 99480eb7
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html> <html>
<head> <head>
<x:base include="layout,dialog,grid,tree,dateTime,combox,attachment,commonTree,comboDialog"/> <x:base include="layout,dialog,grid,tree,date,dateTime,combox,attachment,commonTree,comboDialog"/>
<x:script src="/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js"/> <x:script src="/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js"/>
</head> </head>
<body> <body>
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<x:hidden name="personMemberName"/> <x:hidden name="personMemberName"/>
<x:hidden name="statusId"/> <x:hidden name="statusId"/>
<x:hidden name="ids"/> <x:hidden name="ids"/>
<x:hidden name="isReadOnly"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
</div> </div>
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordApplicationImpl.java
View file @ 99480eb7
...@@ -209,6 +209,7 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements ...@@ -209,6 +209,7 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
queryModel.putDictionary("status", BizBillStatus.getMap()); queryModel.putDictionary("status", BizBillStatus.getMap());
queryModel.putDictionary("urzla", DictUtil.getDictionary("country")); queryModel.putDictionary("urzla", DictUtil.getDictionary("country"));
queryModel.putDictionary("loekz", DictUtil.getDictionary("loekz")); queryModel.putDictionary("loekz", DictUtil.getDictionary("loekz"));
queryModel.addCriteria(" order by fillin_date desc ");
return this.sqlExecutorDao.executeSlicedQuery(queryModel); return this.sqlExecutorDao.executeSlicedQuery(queryModel);
} }
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/controller/SapPurchaseInfoRecordController.java
View file @ 99480eb7
package com.huigou.topsun.sap.purchaseInfoRecord.controller; package com.huigou.topsun.sap.purchaseInfoRecord.controller;
import com.alibaba.fastjson.JSON;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.context.OrgUnit; import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecordApplication; import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecordApplication;
import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecordItemApplication; import com.huigou.topsun.sap.purchaseInfoRecord.application.SapPurchaseInfoRecordItemApplication;
import com.huigou.topsun.sap.purchaseInfoRecord.domain.SapPurchaseInfoRecord; import com.huigou.topsun.sap.purchaseInfoRecord.domain.SapPurchaseInfoRecord;
import com.huigou.topsun.sap.purchaseInfoRecord.domain.SapPurchaseInfoRecordItem;
import com.huigou.topsun.sap.purchaseInfoRecord.domain.query.SapPurchaseInfoRecordQueryRequest; import com.huigou.topsun.sap.purchaseInfoRecord.domain.query.SapPurchaseInfoRecordQueryRequest;
import com.huigou.topsun.sap.purchaseInfoRecord.repository.SapPurchaseInfoRecordItemRepository;
import com.huigou.topsun.sap.suppliers.domain.SuppliersInfo;
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController; import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO; import com.huigou.util.SDO;
import com.huigou.util.StringUtil;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
...@@ -33,6 +39,8 @@ public class SapPurchaseInfoRecordController extends CommonController { ...@@ -33,6 +39,8 @@ public class SapPurchaseInfoRecordController extends CommonController {
private SapPurchaseInfoRecordApplication sapPurchaseInfoRecordApplication; private SapPurchaseInfoRecordApplication sapPurchaseInfoRecordApplication;
@Autowired @Autowired
private SapPurchaseInfoRecordItemApplication sapPurchaseInfoRecordItemApplication; private SapPurchaseInfoRecordItemApplication sapPurchaseInfoRecordItemApplication;
@Autowired
private SapPurchaseInfoRecordItemRepository sapPurchaseInfoRecordItemRepository;
public String forwardSapPurchaseInfoRecordList(){ public String forwardSapPurchaseInfoRecordList(){
return forward("purchaseInfoRecordList"); return forward("purchaseInfoRecordList");
...@@ -59,10 +67,42 @@ public class SapPurchaseInfoRecordController extends CommonController { ...@@ -59,10 +67,42 @@ public class SapPurchaseInfoRecordController extends CommonController {
return forward("purchaseInfoRecordDetail",sapPurchaseInfoRecord); return forward("purchaseInfoRecordDetail",sapPurchaseInfoRecord);
} }
public String addSapPurchaseInfoRecordDetail() {
SDO sdo = this.getSDO();
String id = sdo.getId();
//String edit=sdo.getString("edit");
String rowId=sdo.getString("rowId");
SapPurchaseInfoRecordItem item = (SapPurchaseInfoRecordItem) com.alibaba.fastjson.JSONObject.parseObject(sdo.getString("param"), SapPurchaseInfoRecordItem.class);
if (StringUtil.isNotBlank(id)&&id.length()>30){ //编辑明细
// item=this.sapPurchaseInfoRecordItemRepository.findOne(id);
} else {
// item = (SapPurchaseInfoRecordItem) com.alibaba.fastjson.JSONObject.parseObject(sdo.getString("param"), SapPurchaseInfoRecordItem.class);
}
if (item!=null){
item.setRowId(rowId);
if (id.equals(rowId)){
item.setId("");
} else {
item.setId(id);
}
}
// SapPurchaseInfoRecord sapPurchaseInfoRecord = sapPurchaseInfoRecordApplication.loadSapPurchaseInfoRecord(id);
return forward("addPurchaseInfoRecordDetail",item);
}
public String saveSapPurchaseInfoRecordDetail() {
SDO sdo = this.getSDO();
String id = sdo.getId();
//SapPurchaseInfoRecord sapPurchaseInfoRecord = sapPurchaseInfoRecordApplication.loadSapPurchaseInfoRecord(id);
return forward("addPurchaseInfoRecordDetail",sdo);
// return success();
}
public String showSapPurchaseInfoRecordDetail(){ public String showSapPurchaseInfoRecordDetail(){
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
String id = sdo.getBizId(); String id = sdo.getBizId();
SapPurchaseInfoRecord sapPurchaseInfoRecord = sapPurchaseInfoRecordApplication.loadSapPurchaseInfoRecord(id); SapPurchaseInfoRecord sapPurchaseInfoRecord = sapPurchaseInfoRecordApplication.loadSapPurchaseInfoRecord(id);
this.putAttribute("isReadOnly",sdo.getString("isReadOnly"));
return forward("purchaseInfoRecordDetail",sapPurchaseInfoRecord); return forward("purchaseInfoRecordDetail",sapPurchaseInfoRecord);
} }
......
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/controller/SapPurchaseInfoRecordItemController.java
View file @ 99480eb7
...@@ -41,7 +41,18 @@ public class SapPurchaseInfoRecordItemController extends CommonController { ...@@ -41,7 +41,18 @@ public class SapPurchaseInfoRecordItemController extends CommonController {
public String deleteSapPurchaseInfoRecordItem(){ public String deleteSapPurchaseInfoRecordItem(){
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
List<String> ids = sdo.getIds(); List<String> ids = sdo.getIds();
sapPurchaseInfoRecordItemApplication.deleteByIds(ids); for (String id:ids){
if (id.equals("undefined")){
ids.remove(id);
if (ids.size()==0){
break;
}
}
}
System.out.println("ids==="+ids);
if (ids!=null&&ids.size()>0) {
sapPurchaseInfoRecordItemApplication.deleteByIds(ids);
}
return success(); return success();
} }
} }
topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/SapPurchaseInfoRecordItem.java
View file @ 99480eb7
...@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.purchaseInfoRecord.domain; ...@@ -2,6 +2,7 @@ package com.huigou.topsun.sap.purchaseInfoRecord.domain;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.huigou.data.domain.model.AbstractEntity; import com.huigou.data.domain.model.AbstractEntity;
import com.topsunit.query.annotations.Dictionary;
import lombok.Data; import lombok.Data;
import javax.persistence.*; import javax.persistence.*;
...@@ -190,6 +191,10 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity { ...@@ -190,6 +191,10 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
*/ */
@Column(name = "URZLA") @Column(name = "URZLA")
private String urzla; private String urzla;
@Column(name = "URZLA_NAME")
private String urzlaName;
/** /**
* 地区 * 地区
*/ */
...@@ -324,5 +329,8 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity { ...@@ -324,5 +329,8 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
@Column(name = "MESSAGE") @Column(name = "MESSAGE")
private String MESSAGE; private String MESSAGE;
@Transient
private String rowId;
} }
topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/controller/SapQualityInfoRecordController.java
View file @ 99480eb7
...@@ -3,7 +3,9 @@ package com.huigou.topsun.sap.qualityInfoRecord.controller; ...@@ -3,7 +3,9 @@ package com.huigou.topsun.sap.qualityInfoRecord.controller;
import com.huigou.context.Operator; import com.huigou.context.Operator;
import com.huigou.context.OrgUnit; import com.huigou.context.OrgUnit;
import com.huigou.topsun.sap.qualityInfoRecord.application.SapQualityInfoRecordApplication; import com.huigou.topsun.sap.qualityInfoRecord.application.SapQualityInfoRecordApplication;
import com.huigou.topsun.sap.qualityInfoRecord.application.SapQualityInfoRecordItemApplication;
import com.huigou.topsun.sap.qualityInfoRecord.domain.SapQualityInfoRecord; import com.huigou.topsun.sap.qualityInfoRecord.domain.SapQualityInfoRecord;
import com.huigou.topsun.sap.qualityInfoRecord.domain.SapQualityInfoRecordItem;
import com.huigou.topsun.sap.qualityInfoRecord.domain.query.SapQualityInfoRecordQueryRequest; import com.huigou.topsun.sap.qualityInfoRecord.domain.query.SapQualityInfoRecordQueryRequest;
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
...@@ -13,6 +15,7 @@ import oracle.sql.NUMBER; ...@@ -13,6 +15,7 @@ import oracle.sql.NUMBER;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -30,6 +33,8 @@ public class SapQualityInfoRecordController extends CommonController { ...@@ -30,6 +33,8 @@ public class SapQualityInfoRecordController extends CommonController {
@Resource @Resource
private SapQualityInfoRecordApplication sapQualityInfoRecordApplication; private SapQualityInfoRecordApplication sapQualityInfoRecordApplication;
@Resource
private SapQualityInfoRecordItemApplication sapQualityInfoRecordItemApplication;
public String forwardSapQualityInfoRecordList(){ public String forwardSapQualityInfoRecordList(){
return forward("qualityInfoRecordList"); return forward("qualityInfoRecordList");
...@@ -60,7 +65,8 @@ public class SapQualityInfoRecordController extends CommonController { ...@@ -60,7 +65,8 @@ public class SapQualityInfoRecordController extends CommonController {
SDO sdo = this.getSDO(); SDO sdo = this.getSDO();
String id = sdo.getBizId(); String id = sdo.getBizId();
SapQualityInfoRecord sapQualityInfoRecord = sapQualityInfoRecordApplication.loadSapQualityInfoRecord(id); SapQualityInfoRecord sapQualityInfoRecord = sapQualityInfoRecordApplication.loadSapQualityInfoRecord(id);
return forward("qualityInfoRecordDetail", sapQualityInfoRecord); List<SapQualityInfoRecordItem> list=sapQualityInfoRecordItemApplication.findBySapQualityInfoRecordId(id);
return forward("qualityInfoRecordDetail", list.get(0));
} }
public String copyQualityInfoRecord(){ public String copyQualityInfoRecord(){
......
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