Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
topsun-bpm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
鲁鑫
topsun-bpm
Commits
e69d95c5
Commit
e69d95c5
authored
Apr 16, 2024
by
鲁鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
质量信息改为表单页面,增加字段
parent
5bb353e3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
454 additions
and
384 deletions
+454
-384
sapFixedAssetsList.js
...n/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsList.js
+3
-3
sapPurchaseList.js
...rc/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js
+1
-1
qualityInfoRecordDetail.js
...z/topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.js
+85
-4
qualityInfoRecordDetail.jsp
.../topsun/sap/qualityInfoRecord/qualityInfoRecordDetail.jsp
+46
-1
qualityInfoRecordList.js
...biz/topsun/sap/qualityInfoRecord/qualityInfoRecordList.js
+3
-3
SapFixedAssetsApplicationImpl.java
...ssets/application/impl/SapFixedAssetsApplicationImpl.java
+1
-0
SapQualityInfoRecordApplicationImpl.java
...application/impl/SapQualityInfoRecordApplicationImpl.java
+41
-44
SapQualityInfoRecordController.java
...InfoRecord/controller/SapQualityInfoRecordController.java
+12
-1
SapQualityInfoRecord.java
...un/sap/qualityInfoRecord/domain/SapQualityInfoRecord.java
+205
-2
SapQualityInfoRecordItemVo.java
...alityInfoRecord/domain/vo/SapQualityInfoRecordItemVo.java
+38
-0
easy-search-monthlySettlementMethod.xml
...ontent/easysearch/easy-search-monthlySettlementMethod.xml
+0
-17
easy-search-product.xml
...sources/config/content/easysearch/easy-search-product.xml
+0
-188
easy-search-proofing.xml
...ources/config/content/easysearch/easy-search-proofing.xml
+0
-65
easy-search-province.xml
...ources/config/content/easysearch/easy-search-province.xml
+0
-40
easy-search-suppliers.xml
...urces/config/content/easysearch/easy-search-suppliers.xml
+19
-0
easy-search-technology.xml
...rces/config/content/easysearch/easy-search-technology.xml
+0
-15
No files found.
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
:
"status
Id
"
,
width
:
140
,
minWidth
:
60
,
type
:
"string"
,
align
:
"left"
},
{
display
:
"流程状态"
,
name
:
"status
TextView
"
,
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
This diff is collapsed.
Click to expand it.
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
This diff is collapsed.
Click to expand it.
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment