Skip to content

T
topsun-bpm
Commit e69d95c5 authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

质量信息改为表单页面，增加字段

parent 5bb353e3
Hide whitespace changes
Inline Side-by-side
Showing with 454 additions and 384 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsList.js
View file @ e69d95c5
......@@ -36,9 +36,9 @@ function loadCostCenterListGrid() {
{display: "成本中心", name: "kostl", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "责任成本中心", name: "kostlv", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "填报日期", name: "fillinDate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "流程状态", name: "statusId", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "流程状态", name: "statusTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "人员名称", name: "personMemberName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "left"},
//{display: "消息类型", name: "type", width: 100, minWidth: 60, type: "string", align: "left"},
{display: "消息文本", name: "message", width: 200, minWidth: 60, type: "string", align: "left"},
],
......@@ -92,7 +92,7 @@ function updateHandler(row) {
UICtrl.addTabItem({
tabid: 'FixedAssetsDetail'+ row.id,
text: "查看固定资产",
url: web_app.name + '/sapFixedAssets/showFixedAssetsDetail.do?isReadOnly=true&id='+row.id
url: web_app.name + '/sapFixedAssets/showFixedAssetsDetail.job?isReadOnly=true&id='+row.id
})
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
View file @ e69d95c5
......@@ -92,7 +92,7 @@ function insertHandler() {
var _self = this;
var bsart = $("#bsart").val();
UICtrl.addTabItem({
tabid: 'addPurchase',
tabid: 'addPurchase'+bsart,
text: '新增采购申请',
url: web_app.name + '/sapPurchase/forwardSapPurchaseDetail.job?bsart='+bsart
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js
View file @ e69d95c5
var itemGridManager = null,fillinDate="";
$(function () {
initItemGrid();
initialize();
//initItemGrid();
bindEvent();
});
function bindEvent() {
function initialize(){
fillinDate = $("#fillinDate").val();
$('#qualityInfoRecordList').fileList();
UICtrl.layout("#layout", {leftWidth: 3});
}
function bindEvent() {
//工厂
$('#werksName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "WERKS"}
},
onChange: function (value, data) {
$('#werks').val(data.WERKS);
$('#werksName').val(data.NAME1);
}
});
//供应商
$('#lifnrName').searchbox({
type: "suppliers", name: "selectSuppliers",
getParam: function (item) {
},
onChange: function (value, data) {
$('#lieferant').val(data.partner);
$('#lifnrName').val(data.nameOrg1);
}
});
//物料编码
$('#matnr').searchbox({
type: "system", name: "sapMaterialSelect",
getParam: function (item) {
if (Public.isBlank($("#werks").val())){
Public.tip("请先选择工厂");
return false;
}
if (Public.isNotBlank($("#matkl").val()) && Public.isBlank($("#maktx").val())){
Public.tip("选择了物料组不能再选择物料");
return false;
}
return {
filterValue: $("#werks").val()
}
},
onChange: function (value, data) {
$('#matnr').val(data.MATNR);
$('#maktx').val(data.MAKTX);
$('#matkl').val(data.MATKL);
$('#matklName').val(data.WGBEZ);
}
});
//物料组
$('#matklName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
if (Public.isNotBlank($("#matnr").val())){
Public.tip("选择了物料不能再选择物料组");
return false;
}
return {fieldName: "MATKL"}
},
onChange: function (value, data) {
$('#matkl').val(data.MATKL);
$('#matklName').val(data.WGBEZ);
}
});
$('#unitName').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "MEINS"}
},
onChange: function (value, data) {
$('#unit').val(data.MSEHI);
$('#unitName').val(data.MSEHL);
}
});
}
function initItemGrid() {
......@@ -329,8 +409,9 @@ function getId() {
function setId(value) {
$("#id").val(value);
var _grid=UICtrl.getGridManager('#maingrid');
_grid.options.parms.sapQualityInfoRecordId = value;
//var _grid=UICtrl.getGridManager('#maingrid');
//_grid.options.parms.sapQualityInfoRecordId = value;
$('#qualityInfoRecordList').fileList({bizId : value});
}
function reloadGrid() {
......
topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.jsp
View file @ e69d95c5
......@@ -25,12 +25,57 @@
<x:hidden name="personMemberId"/>
<x:hidden name="personMemberName"/>
<x:hidden name="statusId"/>
<x:hidden name="tempId"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="zqinfno" required="false" readonly="true" label="质量信息记录号" labelCol="2" fieldCol="2" />
<x:hidden name="werks"/>
<x:inputC name="werksName" required="true" label="工厂" labelCol="2" fieldCol="2" wrapper="select"/>
<x:hidden name="lieferant"/>
<x:inputC name="lifnrName" required="true" label="供应商" labelCol="2" fieldCol="2" wrapper="select"/>
</div>
<div class="hg-form-row">
<x:inputC name="matnr" required="false" label="物料编码" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="maktx" required="false" readonly="true" label="物料描述" labelCol="2" fieldCol="2" />
<x:hidden name="matkl"/>
<x:inputC name="matklName" required="false" label="物料组" labelCol="2" fieldCol="2" wrapper="select"/>
</div>
<div class="hg-form-row">
<x:inputC name="batchNo" required="true" label="批次号" labelCol="2" fieldCol="2" />
<x:inputC name="checkNumber" required="true" label="检验数量" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:hidden name="unit"/>
<x:inputC name="unitName" required="true" label="单位" labelCol="2" fieldCol="2" wrapper="select"/>
</div>
<div class="hg-form-row">
<x:inputC name="certificateYear" required="true" label="凭证年份" labelCol="2" fieldCol="2" wrapper="year"/>
<x:inputC name="certificateNo" required="true" label="凭证号" labelCol="2" fieldCol="2" />
<x:inputC name="certificateItem" required="true" label="凭证项次" labelCol="2" fieldCol="2" />
</div>
<div class="hg-form-row">
<x:inputC name="zspaufnr" required="false" label="打样单号码" labelCol="2" fieldCol="2" />
<x:inputC name="zvdatab" required="true" label="合格有效期从" labelCol="2" fieldCol="2" wrapper="date"/>
<x:inputC name="zvdatai" required="true" label="合格有效期到" labelCol="2" fieldCol="2" wrapper="date"/>
</div>
<div class="hg-form-row">
<x:inputC name="zqavfn1" required="false" readonly="true" label="合格准入验证节点1" labelCol="2" fieldCol="2" />
<x:inputC name="zvfnc1" required="false" readonly="true" label="节点1结论" labelCol="2" fieldCol="2" />
<x:inputC name="zqavfn3" required="false" readonly="true" label="合格准入验证节点3" labelCol="2" fieldCol="2" />
</div>
<div class="hg-form-row">
<x:inputC name="zqavfn2" required="false" readonly="true" label="合格准入验证节点2" labelCol="2" fieldCol="2" />
<x:inputC name="zvfnc2" required="false" readonly="true" label="节点2结论" labelCol="2" fieldCol="2" />
<x:inputC name="zvfnc3" required="false" readonly="true" label="节点3结论" labelCol="2" fieldCol="2" />
</div>
<div class="hg-form-row">
<x:inputC name="zqafst" required="false" label="合格准入状态" labelCol="2" fieldCol="2" />
</div>
<div class="hg-form-row">
<x:textareaC name="ztext" required="false" label="备注文本" labelCol="2" fieldCol="10" rows="3"/>
</div>
</div>
<div id="maingrid"></div>
<div style="padding-top: 15px;">
<x:fileList bizCode="qualityInfoRecord" bizId="id" id="qualityInfoRecordList" title="供应商技术参数" />
</div>
</form>
</div>
</body>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/qualityInfoRecord/qualityInfoRecordList.js
View file @ e69d95c5
......@@ -153,7 +153,7 @@ function viewHandler(id) {
}
UICtrl.addTabItem({
tabid: 'viewQualityInfoRecord' + id,
text: '查看采购信息记录',
text: '查看质量信息记录',
url: web_app.name + '/sapQualityInfoRecord/showSapQualityInfoRecordDetail.job?isReadOnly=true&bizId=' + id
});
}
......@@ -165,7 +165,7 @@ function updateHandler() {
}
UICtrl.addTabItem({
tabid: 'updateQualityInfoRecord' + row.id,
text: '修改采购信息记录',
text: '修改质量信息记录',
url: web_app.name + '/sapQualityInfoRecord/showSapQualityInfoRecordDetail.job?bizId=' + row.id
});
......@@ -225,7 +225,7 @@ function copyQualityInfoRecord(){
}
UICtrl.addTabItem({
tabid: 'copyQualityInfoRecord' + row.sapQualityInfoRecordId,
text: '复制采购信息记录',
text: '复制质量信息记录',
url: web_app.name + '/sapQualityInfoRecord/copyQualityInfoRecord.job?id=' + row.sapQualityInfoRecordId
});
}
......
topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/application/impl/SapFixedAssetsApplicationImpl.java
View file @ e69d95c5
......@@ -46,6 +46,7 @@ public class SapFixedAssetsApplicationImpl extends FlowBroker implements SapFixe
public Map<String, Object> getFixedAssetsList(SapFixedAssetsQueryRequest sapFixedAssetsQueryRequest) {
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "sapFixedAssets");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, sapFixedAssetsQueryRequest);
queryModel.putDictionary("status",BizBillStatus.getMap());
Map<String, Object> map = this.sqlExecutorDao.executeSlicedQuery(queryModel);
return map;
......
topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/application/impl/SapQualityInfoRecordApplicationImpl.java
View file @ e69d95c5
......@@ -13,16 +13,17 @@ import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
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.SapQualityInfoRecordItem;
import com.huigou.topsun.sap.qualityInfoRecord.domain.query.SapQualityInfoRecordQueryRequest;
import com.huigou.topsun.sap.qualityInfoRecord.domain.vo.SapQualityInfoRecordItemVo;
import com.huigou.topsun.sap.qualityInfoRecord.repository.SapQualityInfoRecordRepository;
import com.huigou.topsun.sap.suppliers.domain.SuppliersInfo;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.bmp.fn.CodeGenerator;
import com.huigou.uasp.bpm.FlowBroker;
import com.huigou.uasp.bpm.engine.domain.model.ProcUnitHandler;
import com.huigou.uasp.bpm.engine.domain.model.TaskExtension;
import com.huigou.util.ClassHelper;
import com.huigou.util.StringUtil;
import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -46,10 +47,12 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
@Autowired
private SapQualityInfoRecordRepository sapQualityInfoRecordRepository;
//@Autowired
//private SapQualityInfoRecordItemApplication sapQualityInfoRecordItemApplication;
@Autowired
private SapQualityInfoRecordItemApplication sapQualityInfoRecordItemApplication;
@Resource
private HttpClient httpClient;
@Autowired
private CodeGenerator codeGenerator;
@Override
protected String saveBizAndApprovalData() {
super.saveBizAndApprovalData();
......@@ -59,9 +62,14 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
} else {
sapQualityInfoRecord = (SapQualityInfoRecord) commonDomainService.loadAndFillinProperties(sapQualityInfoRecord);
}
sapQualityInfoRecord = sapQualityInfoRecordRepository.save(sapQualityInfoRecord);
List<SapQualityInfoRecordItem> sapQualityInfoRecordItems = getBizEntities(SapQualityInfoRecordItem.class, "items");
sapQualityInfoRecordItemApplication.saveSapQualityInfoRecordItem(sapQualityInfoRecord.getId(), sapQualityInfoRecordItems);
if (StringUtil.isBlank(sapQualityInfoRecord.getZqinfno())){
String nextCode = codeGenerator.getNextCode("zqinfno");
String zqinfno = sapQualityInfoRecord.getWerks() + "-" + nextCode.replace("-0", "-00");
sapQualityInfoRecord.setZqinfno(zqinfno);
}
sapQualityInfoRecordRepository.save(sapQualityInfoRecord);
//List<SapQualityInfoRecordItem> sapQualityInfoRecordItems = getBizEntities(SapQualityInfoRecordItem.class, "items");
//sapQualityInfoRecordItemApplication.saveSapQualityInfoRecordItem(sapQualityInfoRecord.getId(), sapQualityInfoRecordItems);
return sapQualityInfoRecord.getId();
}
......@@ -70,35 +78,28 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
protected void onBeforeComplete(DelegateTask delegateTask) {
super.onBeforeComplete(delegateTask);
String bizId = delegateTask.getExecution().getProcessBusinessKey();
SapQualityInfoRecord sapQualityInfoRecord = sapQualityInfoRecordRepository.findOne(bizId);
if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
SapQualityInfoRecord sapQualityInfoRecord = sapQualityInfoRecordRepository.findOne(bizId);
sapQualityInfoRecord.setStatusId(BizBillStatus.APPROVING.getId());
sapQualityInfoRecordRepository.save(sapQualityInfoRecord);
}
if (!isApplyProcUnit(delegateTask)) {
List<SapQualityInfoRecordItem> purchaseInfoRecordItemList = sapQualityInfoRecordItemApplication.findBySapQualityInfoRecordId(bizId);
TaskExtension te = actApplication.loadRuntimeTaskExtension(delegateTask.getId());
Assert.notNull(te, String.format("未查询到流程任务【%s】的扩展信息", delegateTask.getId()));
// 获取流程任务对应的审批环节信息
ProcUnitHandler procUnitHandler = procUnitHandlerApplication.loadProcUnitHandler(te.getProcUnitHandlerId());
String subProcUnitId = procUnitHandler.getSubProcUnitId();
if ("stage1".equals(subProcUnitId)){
for (SapQualityInfoRecordItem item : purchaseInfoRecordItemList) {
item.setZqavfn1("S1");
item.setZvfnc1("A");
item.setZqafst("02");
sapQualityInfoRecordItemApplication.save(item);
}
sapQualityInfoRecord.setZqavfn1("S1");
sapQualityInfoRecord.setZvfnc1("A");
sapQualityInfoRecord.setZqafst("02");
}
if ("stage2".equals(subProcUnitId)){
for (SapQualityInfoRecordItem item : purchaseInfoRecordItemList) {
item.setZqavfn2("Q1");
item.setZvfnc2("A");
item.setZqafst("04");
sapQualityInfoRecordItemApplication.save(item);
}
sapQualityInfoRecord.setZqavfn2("Q1");
sapQualityInfoRecord.setZvfnc2("A");
sapQualityInfoRecord.setZqafst("04");
}
}
sapQualityInfoRecordRepository.save(sapQualityInfoRecord);
}
......@@ -149,14 +150,14 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
}
public void getSapPurchaseInfoRecordItemVo(SapQualityInfoRecord sapQualityInfoRecord){
List<SapQualityInfoRecordItem> purchaseInfoRecordItemList = sapQualityInfoRecordItemApplication.findBySapQualityInfoRecordId(sapQualityInfoRecord.getId());
//List<SapQualityInfoRecordItem> purchaseInfoRecordItemList = sapQualityInfoRecordItemApplication.findBySapQualityInfoRecordId(sapQualityInfoRecord.getId());
List<SapQualityInfoRecordItemVo> sapQualityInfoRecordItemVoList = new ArrayList<>();
purchaseInfoRecordItemList.forEach(sapQualityInfoRecordItem -> {
SapQualityInfoRecordItemVo sapQualityInfoRecordItemVo = new SapQualityInfoRecordItemVo();
sapQualityInfoRecordItem.setZqavfn3("M1");
sapQualityInfoRecordItem.setZvfnc3("A");
sapQualityInfoRecordItem.setZqafst("11");
BeanUtil.copyProperties(sapQualityInfoRecordItem, sapQualityInfoRecordItemVo);
//purchaseInfoRecordItemList.forEach(sapQualityInfoRecordItem -> {
SapQualityInfoRecordItemVo sapQualityInfoRecordItemVo = new SapQualityInfoRecordItemVo();
sapQualityInfoRecord.setZqavfn3("M1");
sapQualityInfoRecord.setZvfnc3("A");
sapQualityInfoRecord.setZqafst("11");
BeanUtil.copyProperties(sapQualityInfoRecord, sapQualityInfoRecordItemVo);
if ("0".equals(sapQualityInfoRecordItemVo.getGrsrq())){
sapQualityInfoRecordItemVo.setGrsrq("");
}
......@@ -164,20 +165,20 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
sapQualityInfoRecordItemVo.setFscrq("");
}
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
if (sapQualityInfoRecordItem.getGrscertdatai() !=null){
String datab = dateFormat.format(sapQualityInfoRecordItem.getGrscertdatai());
if (sapQualityInfoRecord.getGrscertdatai() !=null){
String datab = dateFormat.format(sapQualityInfoRecord.getGrscertdatai());
sapQualityInfoRecordItemVo.setGrscertdatai(datab);
}
if (sapQualityInfoRecordItem.getFsccertdatai() != null){
String datbi = dateFormat.format(sapQualityInfoRecordItem.getFsccertdatai());
if (sapQualityInfoRecord.getFsccertdatai() != null){
String datbi = dateFormat.format(sapQualityInfoRecord.getFsccertdatai());
sapQualityInfoRecordItemVo.setFsccertdatai(datbi);
}
if (sapQualityInfoRecordItem.getZvdatab() != null){
String zvdatab = dateFormat.format(sapQualityInfoRecordItem.getZvdatab());
if (sapQualityInfoRecord.getZvdatab() != null){
String zvdatab = dateFormat.format(sapQualityInfoRecord.getZvdatab());
sapQualityInfoRecordItemVo.setZvdatab(zvdatab);
}
if (sapQualityInfoRecordItem.getZvdatai() != null){
String zvdatai = dateFormat.format(sapQualityInfoRecordItem.getZvdatai());
if (sapQualityInfoRecord.getZvdatai() != null){
String zvdatai = dateFormat.format(sapQualityInfoRecord.getZvdatai());
sapQualityInfoRecordItemVo.setZvdatai(zvdatai);
}
if (sapQualityInfoRecord.getFillinDate() != null){
......@@ -186,7 +187,7 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
}
sapQualityInfoRecordItemVo.setErsteller(sapQualityInfoRecord.getPersonMemberName());
sapQualityInfoRecordItemVoList.add(sapQualityInfoRecordItemVo);
});
//});
try {
String url = SystemCache.getParameter("sap.QualityInfoRecord.url", String.class);
String execute = httpClient.execute(sapQualityInfoRecordItemVoList, url);
......@@ -195,14 +196,10 @@ public class SapQualityInfoRecordApplicationImpl extends FlowBroker implements S
if (!"S".equals(sapResult.getTYPE())){
throw new RuntimeException("数据传输失败，"+ sapResult.getMESSAGE());
}
for (SapQualityInfoRecordItem sapQualityInfoRecordItem : purchaseInfoRecordItemList) {
if (sapResult.getMESSAGE_V1().equals(sapQualityInfoRecordItem.getZqinfno())){
sapQualityInfoRecordItem.setType(sapResult.getTYPE());
sapQualityInfoRecordItem.setMessage(sapResult.getMESSAGE());
sapQualityInfoRecordItemApplication.save(sapQualityInfoRecordItem);
}
}
}
sapQualityInfoRecord.setType(resultList.get(0).getTYPE());
sapQualityInfoRecord.setMessage(resultList.get(0).getMESSAGE());
this.sapQualityInfoRecordRepository.save(sapQualityInfoRecord);
} catch (IOException e) {
throw new RuntimeException(e);
}
......
topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/controller/SapQualityInfoRecordController.java
View file @ e69d95c5
......@@ -9,6 +9,7 @@ import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.bmp.common.BizBillStatus;
import com.huigou.uasp.client.CommonController;
import com.huigou.util.SDO;
import oracle.sql.NUMBER;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
......@@ -69,8 +70,18 @@ public class SapQualityInfoRecordController extends CommonController {
SDO sdo = this.getSDO();
String id = sdo.getId();
SapQualityInfoRecord sapQualityInfoRecord = sapQualityInfoRecordApplication.loadSapQualityInfoRecord(id);
sapQualityInfoRecord.setTempId(sapQualityInfoRecord.getId());
sapQualityInfoRecord.setId(null);
sapQualityInfoRecord.setZqinfno(null);
sapQualityInfoRecord.setType(null);
sapQualityInfoRecord.setMessage(null);
sapQualityInfoRecord.setZqavfn1(null);
sapQualityInfoRecord.setZvfnc1(null);
sapQualityInfoRecord.setZqavfn2(null);
sapQualityInfoRecord.setZvfnc2(null);
sapQualityInfoRecord.setZqavfn3(null);
sapQualityInfoRecord.setZvfnc3(null);
sapQualityInfoRecord.setZqavfn4(null);
sapQualityInfoRecord.setZvfnc4(null);
sapQualityInfoRecord.setStatusId(BizBillStatus.APPLYING.getId());
Operator operator = getOperator();
sapQualityInfoRecord.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
......
topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/domain/SapQualityInfoRecord.java
View file @ e69d95c5
......@@ -3,9 +3,12 @@ package com.huigou.topsun.sap.qualityInfoRecord.domain;
import com.huigou.data.domain.model.FlowBillAbstractEntity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.math.BigDecimal;
import java.util.Date;
/**
* @Auther: xin.lu
......@@ -16,9 +19,209 @@ import javax.persistence.Transient;
@Entity
@Data
public class SapQualityInfoRecord extends FlowBillAbstractEntity {
/**
* 质量信息记录号
*/
@Column(name = "ZQINFNO")
private String zqinfno;
/**
* 物料编码
*/
@Column(name = "MATNR")
private String matnr;
/**
* 物料描述
*/
@Column(name = "MAKTX")
private String maktx;
/**
* 物料组
*/
@Column(name = "MATKL")
private String matkl;
/**
* 物料组
*/
@Column(name = "MATKL_NAME")
private String matklName;
/**
* 工厂
*/
@Column(name = "WERKS")
private String werks;
@Transient
private String tempId;
/**
* 工厂
*/
@Column(name = "WERKS_NAME")
private String werksName;
/**
* 供应商
*/
@Column(name = "LIEFERANT")
private String lieferant;
/**
* 供应商
*/
@Column(name = "LIFNR_NAME")
private String lifnrName;
/**
* 合格准入验证节点1
*/
@Column(name = "ZQAVFN1")
private String zqavfn1;
/**
* 节点1结论
*/
@Column(name = "ZVFNC1")
private String zvfnc1;
/**
* 合格准入验证节点2
*/
@Column(name = "ZQAVFN2")
private String zqavfn2;
/**
* 节点2结论
*/
@Column(name = "ZVFNC2")
private String zvfnc2;
/**
* 合格准入验证节点3
*/
@Column(name = "ZQAVFN3")
private String zqavfn3;
/**
* 节点3结论
*/
@Column(name = "ZVFNC3")
private String zvfnc3;
/**
* 合格准入验证节点4
*/
@Column(name = "ZQAVFN4")
private String zqavfn4;
/**
* 节点4结论
*/
@Column(name = "ZVFNC4")
private String zvfnc4;
/**
* 打样单号码
*/
@Column(name = "ZSPAUFNR")
private String zspaufnr;
/**
* GRSRQ
*/
@Column(name = "GRSRQ")
private String grsrq;
/**
* GRS证书号
*/
@Column(name = "GRSCERTNR")
private String grscertnr;
/**
* GRS证书到期日
*/
@Column(name = "GRSCERTDATAI")
private Date grscertdatai;
/**
* FSC认证要求
*/
@Column(name = "FSCRQ")
private String fscrq;
/**
* FSC证书号
*/
@Column(name = "FSCCERTNR")
private String fsccertnr;
/**
* FSC证书到期日
*/
@Column(name = "FSCCERTDATAI")
private Date fsccertdatai;
/**
* 合格准入状态
*/
@Column(name = "ZQAFST")
private String zqafst;
/**
* 合格有效期从
*/
@Column(name = "ZVDATAB")
private Date zvdatab;
/**
* 合格有效期到
*/
@Column(name = "ZVDATAI")
private Date zvdatai;
/**
* 备注文本
*/
@Column(name = "ZTEXT")
private String ztext;
/**
* 消息类型
*/
@Column(name = "TYPE")
private String type;
/**
* 消息文本
*/
@Column(name = "MESSAGE")
private String message;
/**
* 批次号
*/
@Column(name = "BATCH_NO")
private String batchNo;
/**
* 检验数量
*/
@Column(name = "CHECK_NUMBER")
private BigDecimal checkNumber;
/**
* 单位
*/
@Column(name = "UNIT")
private String unit;
/**
* 单位描述
*/
@Column(name = "UNIT_NAME")
private String unitName;
/**
* 凭证年份
*/
@Column(name = "CERTIFICATE_YEAR")
private String certificateYear;
/**
* 凭证号
*/
@Column(name = "CERTIFICATE_NO")
private String certificateNo;
/**
* 凭证项次
*/
@Column(name = "CERTIFICATE_ITEM")
private String certificateItem;
@Override
protected String getCodeRuleId() {
......
topsun/src/main/java/com/huigou/topsun/sap/qualityInfoRecord/domain/vo/SapQualityInfoRecordItemVo.java
View file @ e69d95c5
......@@ -5,7 +5,9 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* @Auther: xin.lu
......@@ -165,4 +167,40 @@ public class SapQualityInfoRecordItemVo implements Serializable {
@JsonProperty("ZMMAENDERDAT")
private String aenderdat;// 最近修改日期
/**
* 批次号
*/
@JsonProperty("BATCH_NO")
private String batchNo;
/**
* 检验数量
*/
@JsonProperty("CHECK_NUMBER")
private BigDecimal checkNumber;
/**
* 单位
*/
@JsonProperty("UNIT")
private String unit;
/**
* 凭证年份
*/
@JsonProperty("CERTIFICATE_YEAR")
private String certificateYear;
/**
* 凭证号
*/
@JsonProperty("CERTIFICATE_NO")
private String certificateNo;
/**
* 凭证项次
*/
@JsonProperty("CERTIFICATE_ITEM")
private String certificateItem;
}
topsun/src/main/resources/config/content/easysearch/easy-search-monthlySettlementMethod.xml deleted 100644 → 0
View file @ 5bb353e3
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="monthlySettlementMethodApplyCode" desc="订单">
<sql>
select m.method_id, m.method,m.status,m.sequence
from monthly_settlement_method m
where status = 1
</sql>
<field name="月结方式" title="月结方式" code="method" width="543"/>
<field name="月结方式Id" title="月结方式id" code="methodId" width="200" type="hidden"/>
<condition column="method" name="method" symbol="like"
alias="m" />
<orderby> sequence asc</orderby>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/src/main/resources/config/content/easysearch/easy-search-product.xml deleted 100644 → 0
View file @ 5bb353e3
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="productCode" desc="产品">
<sql>
select p.product_id,p.product_name,p.product_code,p.product_category_name,b.brand_code
from product p
left join brand b on(b.brand_name=p.brand_name)
</sql>
<field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品名称" title="产品名称" code="productName" width="200" />
<field name="产品编码" title="产品编码" code="productCode" width="200" />
<field name="产品类别" title="产品类别" code="productCategoryName" width="200" />
<field name="品牌客户编号" title="品牌客户编号" code="brandName" width="200" />
<!-- <field name="版面" title="版面" code="productCategoryName" width="200" />-->
</easy-search>
<easy-search name="productCode2" desc="产品">
<sql>
select t.product_category_id, t.product_category_name from product_category t
</sql>
<field name="类型ID" title="类型ID" code="productCategoryId" width="200" />
<field name="产品名称" title="产品名称" code="productCategoryName" width="200" />
</easy-search>
<easy-search name="productTechnologyType" desc="产品">
<sql>
SELECT
t.product_id,
t.product_technology_id,
t.product_technology_name,
t.beer_plate_no,
t.gold_plate_no,
t.die_cut_plate_no,
t.copperp_resin_late_no,
t.net_plate_no,
t.product_technology_require,
t.package_style,
t.physical_test,
t.chemistry_test,
t.copperp_no,
t.color_no_card,
t.product_material,
t.plate_no,
t.plastic_bag_structure
FROM
product_technology t
</sql>
<field name="工艺制程" title="工艺制程" code="productTechnologyName" width="200" />
<field name="工艺ID" title="工艺ID" code="productTechnologyId" width="200" />
<field name="产品ID" title="产品ID" code="productId" type='hidden' />
<field code="beerPlateNo" type='hidden' />
<field code="goldPlateNo" type='hidden' />
<field code="beerPlateNo" type='hidden' />
<field code="dieCutPlateNo" type='hidden' />
<field code="copperpResinLateNo" type='hidden' />
<field code="netPlateNo" type='hidden' />
<field code="productTechnologyRequire" type='hidden' />
<field code="packageStyle" type='hidden' />
<field code="physicalTest" type='hidden' />
<field code="chemistryTest" type='hidden' />
<field code="productMaterial" type='hidden' />
<field code="copperpNo" type='hidden' />
<field code="colorNoCard" type='hidden' />
<field code="plateNo" type='hidden' />
<field code="plasticBagStructure" type='hidden' />
</easy-search>
<easy-search name="productFactoryName" desc="产品">
<sql>
select t.factory_code, t.factory_name from factory t
</sql>
<field name="工厂名称" title="工厂名称" code="factoryName" width="200" />
<field name="工厂编号" title="工厂编号" code="factoryCode" width="200" />
</easy-search>
<easy-search name="color" desc="颜色">
<sql>
select t.color_id, t.color_code, t.color_name from color t
</sql>
<field code="colorId" type='hidden' />
<field name="代码" title="代码" code="colorCode" width="200" />
<field name="颜色" title="颜色" code="colorName" width="200" />
</easy-search>
<easy-search name="productS" desc="产品">
<sql>
select pa.product_id,pm.proofing_make_no
from proofing_make pm inner join proofing_apply pa on(pm.proofing_apply_id=pa.id)
</sql>
<field name="制造单号" title="制造单号" code="proofingMakeNo" width="200" />
<field name="产品id" title="产品id" code="productId" width="200" />
</easy-search>
<easy-search name="productDetail" desc="产品详情">
<sql>
SELECT
pi.*,p.product_name,p.product_status,p.product_unit as product_buy_unit,p.brand_name,
p.is_build_bom, p.confirm_date,
p.comfirm_person, p.is_free_inspection, p.is_no_quality_loss, p.sample_order_no,
p.stock_no, p.stock_name, p.file_no,
pd.product_english_name,
wa.work_instruction_apply_id, wa.specification_no, wa.matrixing_value, wa.size_group_id,
wa.is_disable, wa.is_new_specification, wa.is_shoe_pattern,wa.product_unit,
wa.is_attached_sample, wa.is_only_code, wa.is_body_color,wa.brand,wa.store_name,
pl.proofing_make_looked_id, pl.is_output, pl.is_out, pl.is_change,
pl.plastic_bag_structure, pl.product_length, pl.product_width, pl.product_height,
pl.product_thick, pl.product_single_layer, pl.product_layer_num, pl.sample_shape,
pl.sample_shape_size, pl.planned_flow_id, pl.file_storage_location, pl.sample_material,
pl.product_weight, pl.product_aperture, pl.product_single_weight, pl.proofing_make_status,
pl.is_confirm,
pc.proofing_make_pd_published_conf_id, pc.modulus, pc.row_num,
pc.column_num, pc.contact_num, pc.row_double_blade, pc.column_double_blade,
pc.dispatch_multiple, pc.sheet_length, pc.sheet_width, pc.print_front_coler,
pc.print_opposite_color
FROM proofing_make_base_info pi
inner JOIN work_instruction_apply wa ON wa.proofing_make_id = pi.proofing_make_id
inner JOIN proofing_make_looked pl ON pl.proofing_make_id = pi.proofing_make_id
inner JOIN proofing_make_pd_published_conf pc ON pc.proofing_make_id = pi.proofing_make_id
inner join product p on pi.product_code=p.product_code
inner join product_detail pd on pd.product_id=p.product_id
where pi.is_delete=0 and wa.is_delete=0
</sql>
<field name="产品id" title="产品id" code="productId" width="200" />
<field name="产品编号" title="产品编号" code="productCode" width="200" />
<field name="产品name" title="产品name" code="productName" width="200"/>
<field name="唯一码产品" title="唯一码产品" code="isOnlyCode" width="200" type='hidden'/>
<field name="不考虑形体配色" title="不考虑形体配色" code="isBodyColor" width="200" type='hidden'/>
<field name="唯一码产品" title="唯一码产品" code="isOnlyCode" width="200" type='hidden'/>
<field name="是否禁用" title="是否禁用" code="isDisable" width="200" type='hidden'/>
<field name="是否创建新作业指导书" title="是否创建新作业指导书" code="isNewSpecification" width="200" type='hidden'/>
<field name="是否建立BON表" title="是否建立BON表" code="isBuildBom" width="200" type='hidden'/>
<field name="是否要鞋图" title="是否要鞋图" code="isShoePattern" width="200" type='hidden'/>
<field name="是否附样品" title="是否附样品" code="isAttachedSample" width="200" type='hidden'/>
<field name="确认日期" title="确认日期" code="confirmDate" width="200" type='hidden'/>
<field name="确认人" title="确认人" code="comfirmPerson" width="200" type='hidden'/>
<field name="是否免检" title="是否免检" code="isFreeInspection" width="200" type='hidden'/>
<field name="不要质量loss" title="不要质量loss" code="isNoQualityLoss" width="200" type='hidden'/>
<field name="样品单号" title="样品单号" code="sampleOrderNo" width="200" type='hidden'/>
<field name="库存编码" title="库存编码" code="stockNo" width="200" type='hidden'/>
<field name="库存名称" title="库存名称" code="stockName" width="200" type='hidden'/>
<field name="存档编号" title="存档编号" code="fileNo" width="200" type='hidden'/>
<field name="品牌" title="品牌" code="brand" width="200" type='hidden'/>
<field name="仓库" title="仓库" code="storeName" width="200" type='hidden'/>
<field name="尺码组" title="尺码组" code="sizeGroupId" width="200" type='hidden'/>
<field name="采购换算值" title="采购换算值" code="matrixingValue" width="200" type='hidden'/>
<field name="采购单位" title="采购单位" code="productUnit" width="200" type='hidden'/>
<field name="单位" title="单位" code="productBuyUnit" width="200" type='hidden'/>
<field name="制造单号" title="制造单号" code="proofingMakeNo" width="200"/>
<field name="指导申请书单号" title="指导申请书单号" code="workInstructionApplyId" width="200"/>
<field name="长;单位cm" title="长;单位cm" code="productLength" width="200" type='hidden'/>
<field name="宽;单位cm" title="宽;单位cm" code="productWidth" width="200" type='hidden'/>
<field name="高;单位cm" title="高;单位cm" code="productHeight" width="200" type='hidden'/>
<field name="厚度;单位mm" title="厚度;单位mm" code="productThick" width="200" type='hidden'/>
<field name="成品克重;单位g" title="成品克重;单位g" code="productWeight" width="200" type='hidden'/>
<field name="角型" title="角型" code="productAngleType" width="200" type='hidden'/>
<field name="孔径" title="孔径" code="productAperture" width="200" type='hidden'/>
<field name="单层厚" title="单层厚" code="productSingleLayer" width="200" type='hidden'/>
<field name="单重" title="单重" code="productSingleWeight" width="200" type='hidden'/>
<field name="层数" title="层数" code="productLayerNum" width="200" type='hidden'/>
<field name="是否防霉" title="是否防霉(is_open)" code="productMould" width="200" type='hidden'/>
<field name="是否写码" title="是否写码(is_open)" code="productCoding" width="200" type='hidden'/>
<field name="体系认证" title="体系认证" code="productSysCertification" width="200" type='hidden'/>
<field name="排版参数配置id" title="排版参数配置id" code="productPublishedConfId" width="200" type='hidden'/>
<field name="模数" title="模数" code="modulus" width="200" type='hidden'/>
<field name="行数" title="行数" code="rowNum" width="200" type='hidden'/>
<field name="列数" title="列数" code="columnNum" width="200" type='hidden'/>
<field name="搭版数" title="搭版数" code="contactNum" width="200" type='hidden'/>
<field name="行双刀位(单位mm)" title="行双刀位(单位mm)" code="rowDoubleBlade" width="200" type='hidden'/>
<field name="列双刀位(单位mm)" title="列双刀位(单位mm)" code="columnDoubleBlade" width="200" type='hidden'/>
<field name="派工倍数" title="派工倍数" code="dispatchMultiple" width="200" type='hidden'/>
<field name="印张长度(单位cm)" title="印张长度(单位cm)" code="sheetLength" width="200" type='hidden'/>
<field name="印张宽度(单位cm)" title="印张宽度(单位cm)" code="sheetWidth" width="200" type='hidden'/>
<field name="产品印张设置" title="客户名称" code="customerName" width="200" type='hidden'/>
<field name="产品印张设置" title="备注信息" code="productLossRemark" width="200" type='hidden'/>
<field name="产品印张设置" title="loss比率" code="productLossRate" width="200" type='hidden'/>
<field name="产品印张设置" title="冗余量" code="productLossRedundance" width="200" type='hidden'/>
<!-- <field name="产品印张设置" title="产品印张设置" code="productLossMax" width="200" />-->
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/src/main/resources/config/content/easysearch/easy-search-proofing.xml deleted 100644 → 0
View file @ 5bb353e3
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="proofingApplyCode" desc="订单">
<sql>
select pa.proofing_apply_no,pa.proofing_apply_id,pa.product_id,p.product_code
from proofing_apply_base_info pa
inner join product p on(pa.product_id=p.product_id)
where pa.proofing_apply_application_status != 2 and pa.status =3
</sql>
<field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />
<field name="申请Id" title="申请Id" code="proofingApplyId" width="200" />
<field name="产品Id" title="产品Id" code="productId" width="200" type="hidden"/>
<field name="产品编号" title="产品编号" code="productCode" width="200" />
</easy-search>
<easy-search name="proofingMakeCode" desc="订单">
<sql>
<!-- SELECT-->
<!-- pm.proofing_make_no,-->
<!-- pm.proofing_make_id,-->
<!-- pa.proofing_apply_no,-->
<!-- p.product_id,-->
<!-- p.product_name,-->
<!-- p.product_type,-->
<!-- p.brand_name,-->
<!-- pd.product_english_name,-->
<!-- pl.store_name-->
<!-- FROM-->
<!-- proofing_make pm-->
<!-- INNER JOIN-->
<!-- proofing_apply_base_info pa ON pm.proofing_apply_id = pa.proofing_apply_id-->
<!-- INNER JOIN-->
<!-- product p ON pa.product_id = p.product_id-->
<!-- LEFT JOIN-->
<!-- product_detail pd ON pd.product_id = p.product_id-->
<!-- LEFT JOIN-->
<!-- product_looked pl ON pl.product_id = p.product_id-->
SELECT
pm.proofing_make_no,
pm.proofing_make_id,
pm.product_id,
pm.proofing_make_sample_cn_name,
pm.proofing_make_sample_en_name,
p.product_code
FROM
proofing_make_base_info pm
inner join product p on(pm.product_id=p.product_id)
<!-- where pm.proofing_make_application_status ="normal"-->
where pm.is_delete = 0
</sql>
<field name="产品Id" title="产品Id" code="productId" width="200" />
<field name="产品编号" title="产品编号" code="productCode" width="200" />
<field name="制作单号" title="制作单号" code="proofingMakeNo" width="200" />
<field name="制作id" title="制作id" code="proofingMakeId" width="200" type="hidden"/>
<!-- <field name="申请单号" title="申请单号" code="proofingApplyNo" width="200" />-->
<!-- <field name="类型" title="类型" code="productType" width="200" type="hidden"/>-->
<!-- <field name="品牌" title="品牌" code="brandName" width="200" type="hidden"/>-->
<field name="名称" title="名称" code="proofingMakeSampleCnName" width="200" type="hidden"/>
<field name="英文名称" title="英文名称" code="proofingMakeSampleEnName" width="200" type="hidden"/>
<!-- <field name="仓库" title="仓库" code="productId" width="200" type="hidden"/>-->
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/src/main/resources/config/content/easysearch/easy-search-province.xml deleted 100644 → 0
View file @ 5bb353e3
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="provinceCode" desc="省份">
<sql>
select p.province_code, p.province_name,p.province_parent_id
from province p
where p.province_parent_id = 0
</sql>
<field name="客户所在省份" title="客户所在省份" code="provinceName" width="543"/>
<field name="省份编码" title="省份编码" code="provinceCode" width="200" type="hidden"/>
<condition column="province_name" name="province_name" symbol="like"
alias="p"/>
</easy-search>
<easy-search name="cityCode" desc="地级市">
<sql>
select p.province_code, p.province_name,p.province_parent_id
from province p
where 1=1
</sql>
<field name="(地级)市、地区、盟、自治州" title="(地级)市、地区、盟、自治州" code="provinceName" width="543"/>
<field name="地级市编码" title="地级市编码" code="provinceCode" width="200" type="hidden"/>
<condition column="province_parent_id" name="provinceCode" symbol="="
alias="p"/>
</easy-search>
<easy-search name="countyCode" desc="区县">
<sql>
select p.province_code, p.province_name,p.province_parent_id
from province p
where 1=1
</sql>
<field name="县、(县级)市、(市辖)区" title="县、(县级)市、(市辖)区" code="provinceName" width="543"/>
<field name="区县编码" title="区县编码" code="provinceCode" width="200" type="hidden"/>
<condition column="province_parent_id" name="provinceCode" symbol="="
alias="p"/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/src/main/resources/config/content/easysearch/easy-search-suppliers.xml 0 → 100644
View file @ e69d95c5
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="selectSuppliers" desc="供应商">
<sql>
SELECT
DISTINCT
t.partner,
t.name_org1
FROM
sap_suppliers_info t
WHERE t.status = 3 and t.partner not in (select partner from sap_suppliers_info t where t.apply_type = -1)
</sql>
<field name="供应商编码" title="供应商编码" code="partner" width="200"/>
<field name="供应商名称" title="供应商名称" code="nameOrg1" width="200"/>
<condition column="name_org1" name="nameOrg1" symbol="like" alias="t"/>
</easy-search>
</easy-search-mappings>
\ No newline at end of file
topsun/src/main/resources/config/content/easysearch/easy-search-technology.xml deleted 100644 → 0
View file @ 5bb353e3
<?xml version="1.0" encoding="UTF-8"?>
<easy-search-mappings>
<easy-search name="technology" desc="工艺路线">
<sql>
select t.technology_id,t.technology_name,t.technology_version,t.technology_type from technology t where 1=1
</sql>
<field name="工艺路线id" title="工艺路线id" code="technologyId" type="hidden"/>
<field name="工艺路线" title="工艺路线" code="technologyName" width="300"/>
<field name="工艺版本" title="工艺版本" code="technologyVersion" width="100"/>
<field name="工艺类型" title="工艺类型" code="technologyTypeTextView" width="200"/>
<condition column="technology_name" name="technologyName" symbol="like" alias="t" />
</easy-search>
</easy-search-mappings>
\ No newline at end of file
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