Skip to content

H
hg-smart
Commit df92eea7 by liuyang
Options

Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

parents b6d1adff 4df7d620
Showing with 88 additions and 32 deletions
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC003.xml
...@@ -81,6 +81,9 @@ ...@@ -81,6 +81,9 @@
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
</isNotEmpty> </isNotEmpty>
<isEmpty property="orderBy">
CREATED_TIME desc
</isEmpty>
</dynamic> </dynamic>
</select> </select>
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC003A.xml
...@@ -90,6 +90,9 @@ ...@@ -90,6 +90,9 @@
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
</isNotEmpty> </isNotEmpty>
<isEmpty property="orderBy">
CREATED_TIME desc
</isEmpty>
</dynamic> </dynamic>
</select> </select>
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004A.xml
...@@ -154,6 +154,9 @@ ...@@ -154,6 +154,9 @@
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
</isNotEmpty> </isNotEmpty>
<isEmpty property="orderBy">
CREATED_TIME desc
</isEmpty>
</dynamic> </dynamic>
</select> </select>
......
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC004B.xml
...@@ -136,6 +136,9 @@ ...@@ -136,6 +136,9 @@
<isNotEmpty property="orderBy"> <isNotEmpty property="orderBy">
$orderBy$ $orderBy$
</isNotEmpty> </isNotEmpty>
<isEmpty property="orderBy">
CREATED_TIME desc
</isEmpty>
</dynamic> </dynamic>
</select> </select>
......
src/main/java/com/baosight/hggp/util/CommonMethod.java
...@@ -319,4 +319,17 @@ public class CommonMethod { ...@@ -319,4 +319,17 @@ public class CommonMethod {
eiBlock.setRows(rows); eiBlock.setRows(rows);
inInfo.setBlock(eiBlock); inInfo.setBlock(eiBlock);
} }
public static void joinTextField(EiInfo inInfo, String blockId,String prefixValueName){
List rows = inInfo.getBlock(blockId).getRows();
List newRows = new ArrayList(){{
rows.forEach(o -> {
Map<String,Object> map = (Map<String, Object>) o;
map.put(HGConstants.TEXT_FIELD,String.format("[%s]%s",map.get(prefixValueName),map.get(HGConstants.TEXT_FIELD)));
add(o);
});
}};
inInfo.getBlock(blockId).setRows(newRows);
}
} }
src/main/java/com/baosight/xservices/xs/og/service/ServiceXSOG0801A.java
...@@ -53,7 +53,10 @@ public class ServiceXSOG0801A extends ServiceEPBase { ...@@ -53,7 +53,10 @@ public class ServiceXSOG0801A extends ServiceEPBase {
} else { } else {
// 查询组织 // 查询组织
Org org = HGXSTools.XsOrg.get(parentOrgId); Org org = HGXSTools.XsOrg.get(parentOrgId);
if (OrgTypeEnum.COMPANY.getCode().equals(org.getOrgType())) { if(CommonConstant.Field.ROOT.equals(org.getParentOrgId())) {
condition = String.format(" ITEM_CODE IN ('%s', '%s')", OrgTypeEnum.COMPANY.getCode(),
OrgTypeEnum.DEPT.getCode());
}else if (OrgTypeEnum.COMPANY.getCode().equals(org.getOrgType())) {
condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s')", OrgTypeEnum.COMPANY.getCode(), condition = String.format(" ITEM_CODE IN ('%s', '%s', '%s')", OrgTypeEnum.COMPANY.getCode(),
OrgTypeEnum.FACTORY.getCode(), OrgTypeEnum.DEPT.getCode()); OrgTypeEnum.FACTORY.getCode(), OrgTypeEnum.DEPT.getCode());
} else if (OrgTypeEnum.FACTORY.getCode().equals(org.getOrgType())) { } else if (OrgTypeEnum.FACTORY.getCode().equals(org.getOrgType())) {
......
src/main/java/com/baosight/xservices/xs/service/ServiceXS3002.java
package com.baosight.xservices.xs.service; package com.baosight.xservices.xs.service;
import com.baosight.hggp.common.DdynamicEnum; import com.baosight.hggp.common.DdynamicEnum;
import com.baosight.hggp.common.HGConstants;
import com.baosight.hggp.core.security.UserSessionUtils; import com.baosight.hggp.core.security.UserSessionUtils;
import com.baosight.hggp.hg.pz.domain.HGPZ009; import com.baosight.hggp.hg.pz.domain.HGPZ009;
import com.baosight.hggp.hg.pz.tools.HGPZTools; import com.baosight.hggp.hg.pz.tools.HGPZTools;
...@@ -49,6 +50,7 @@ public class ServiceXS3002 extends ServiceEPBase { ...@@ -49,6 +50,7 @@ public class ServiceXS3002 extends ServiceEPBase {
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
try { try {
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.DEPT_CODE_BLOCK_ID)); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.DEPT_CODE_BLOCK_ID));
CommonMethod.joinTextField(inInfo,DdynamicEnum.DEPT_CODE_BLOCK_ID.getBlockId(), HGConstants.PARAM4_FIELD);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_CODE_BLOCK_ID)); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_CODE_BLOCK_ID));
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID)); CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_CODE_BLOCK_ID));
} catch (PlatException e) { } catch (PlatException e) {
......
src/main/webapp/HG/SC/HGSC003.js
...@@ -61,7 +61,7 @@ $(function (){ ...@@ -61,7 +61,7 @@ $(function (){
if(item.projCode){ if(item.projCode){
for(let i=0;i<projCodes.length;i++){ for(let i=0;i<projCodes.length;i++){
if(item.projCode === projCodes[i]['valueField']){ if(item.projCode === projCodes[i]['valueField']){
item['projName'] = projCodes[i]['textField']; // item['projName'] = projCodes[i]['textField'];
template = projCodes[i]['valueField']; template = projCodes[i]['valueField'];
} }
} }
...@@ -104,7 +104,13 @@ $(function (){ ...@@ -104,7 +104,13 @@ $(function (){
grid.dataSource.bind("change", function(e) { grid.dataSource.bind("change", function(e) {
// 判断父级节点是否发生变化 // 判断父级节点是否发生变化
if (e.field == "projCode") { if (e.field == "projCode") {
loadChange(grid,e,"projName"); if(e.items[0].projCode) {
for (let i = 0; i < projCodes.length; i++) {
if (e.items[0].projCode === projCodes[i]['valueField']) {
resultGrid.setCellValue(e.items[0],"projName",projCodes[i]['textField']);
}
}
}
} }
if (e.field == "companyCode") { if (e.field == "companyCode") {
e.items[0].projCode = ""; e.items[0].projCode = "";
......
src/main/webapp/HG/SC/HGSC004.js
...@@ -57,7 +57,7 @@ $(function (){ ...@@ -57,7 +57,7 @@ $(function (){
if(item.projCode){ if(item.projCode){
for(let i=0;i<projCodes.length;i++){ for(let i=0;i<projCodes.length;i++){
if(item.projCode === projCodes[i]['valueField']){ if(item.projCode === projCodes[i]['valueField']){
item['projName'] = projCodes[i]['textField']; // item['projName'] = projCodes[i]['textField'];
template = projCodes[i]['valueField']; template = projCodes[i]['valueField'];
} }
} }
...@@ -143,18 +143,31 @@ $(function (){ ...@@ -143,18 +143,31 @@ $(function (){
grid.dataSource.bind("change", function(e) { grid.dataSource.bind("change", function(e) {
// 判断父级节点是否发生变化 // 判断父级节点是否发生变化
if (e.field == "blueprintCode") { if (e.field == "blueprintCode") {
loadChange(grid,e,"blueprintName"); if(e.items[0].blueprintCode) {
for (let i = 0; i < blueprintCodes.length; i++) {
if (e.items[0].blueprintCode === blueprintCodes[i]['valueField']) {
resultGrid.setCellValue(e.items[0],"blueprintName",blueprintCodes[i]['textField']);
}
}
}
} }
if (e.field == "projCode") { if (e.field == "projCode") {
e.items[0].blueprintCode = ""; if(e.items[0].projCode) {
e.items[0].blueprintName = ""; for (let i = 0; i < projCodes.length; i++) {
loadChange(grid,e,"projName"); if (e.items[0].projCode === projCodes[i]['valueField']) {
resultGrid.setCellValue(e.items[0],"projName",projCodes[i]['textField']);
resultGrid.setCellValue(e.items[0],"blueprintCode","");
resultGrid.setCellValue(e.items[0],"blueprintName","");
}
}
}
loadChange(grid,e,"blueprintCode");
} }
if (e.field == "companyCode") { if (e.field == "companyCode") {
e.items[0].projCode = ""; resultGrid.setCellValue(e.items[0],"projCode","");
e.items[0].projName = ""; resultGrid.setCellValue(e.items[0],"projName","");
e.items[0].blueprintCode = ""; resultGrid.setCellValue(e.items[0],"blueprintCode","");
e.items[0].blueprintName = ""; resultGrid.setCellValue(e.items[0],"blueprintName","");
loadChange(grid,e,"projCode"); loadChange(grid,e,"projCode");
} }
}); });
......
src/main/webapp/HG/SC/HGSC004A.js
...@@ -62,7 +62,7 @@ $(function () { ...@@ -62,7 +62,7 @@ $(function () {
let eiInfo = new EiInfo(); let eiInfo = new EiInfo();
eiInfo.set("inqu_status-0-materialId", $("#inqu_status-0-materialId").val()); eiInfo.set("inqu_status-0-materialId", $("#inqu_status-0-materialId").val());
if (nodeData.lv == 2) { if (nodeData.lv == 2) {
eiInfo.set("inqu_status-0-parInventType", "root"); // eiInfo.set("inqu_status-0-parInventType", "root");
//3级节点选择只能是构建 //3级节点选择只能是构建
eiInfo.set("inqu_status-0-inventTypeDetail", "1"); eiInfo.set("inqu_status-0-inventTypeDetail", "1");
} else if (nodeData.lv == 3) { } else if (nodeData.lv == 3) {
...@@ -158,14 +158,13 @@ $(function () { ...@@ -158,14 +158,13 @@ $(function () {
if(item.productCode){ if(item.productCode){
for(let i=0;i<productCodeBox.length;i++){ for(let i=0;i<productCodeBox.length;i++){
if(item.productCode === productCodeBox[i]['valueField']){ if(item.productCode === productCodeBox[i]['valueField']){
item['productName'] = productCodeBox[i]['textField']; // item['productName'] = productCodeBox[i]['textField'];
item['productId'] = productCodeBox[i]['param1Field']; // item['productId'] = productCodeBox[i]['param1Field'];
item['inventType'] = productCodeBox[i]['param2Field']; // item['inventType'] = productCodeBox[i]['param2Field'];
item['length'] = productCodeBox[i]['param3Field']; // item['length'] = productCodeBox[i]['param3Field'];
item['width'] = productCodeBox[i]['param4Field']; // item['width'] = productCodeBox[i]['param4Field'];
item['thick'] = productCodeBox[i]['param5Field']; // item['thick'] = productCodeBox[i]['param5Field'];
item['productType'] = productCodeBox[i]['param6Field']; // item['productType'] = productCodeBox[i]['param6Field'];
console.log(item)
template = productCodeBox[i]['valueField']; template = productCodeBox[i]['valueField'];
}else{ }else{
template = item.productCode; template = item.productCode;
...@@ -208,7 +207,7 @@ $(function () { ...@@ -208,7 +207,7 @@ $(function () {
input.kendoDropDownList({ input.kendoDropDownList({
dataSource: dataSource, dataSource: dataSource,
minLength: 0, minLength: 0,
dataTextField: "textField", dataTextField: "valueField",
dataValueField: "valueField", dataValueField: "valueField",
optionLabelTemplate: "[#:valueField#]#:textField#", optionLabelTemplate: "[#:valueField#]#:textField#",
valueTemplate: "[#:valueField#]#:textField#", valueTemplate: "[#:valueField#]#:textField#",
...@@ -237,14 +236,20 @@ $(function () { ...@@ -237,14 +236,20 @@ $(function () {
var item = e.items[0]; var item = e.items[0];
// 判断父级节点是否发生变化 // 判断父级节点是否发生变化
if (e.field == "productCode") { if (e.field == "productCode") {
loadChange(grid,e,"productId"); if(e.items[0].productCode) {
loadChange(grid,e,"productName"); for (let i = 0; i < productCodeBox.length; i++) {
loadChange(grid,e,"inventType"); if (e.items[0].productCode === productCodeBox[i]['valueField']) {
loadChange(grid,e,"length"); resultGrid.setCellValue(e.items[0],"productName",productCodeBox[i]['textField']);
loadChange(grid,e,"width"); resultGrid.setCellValue(e.items[0],"productId",productCodeBox[i]['param1Field']);
loadChange(grid,e,"thick"); resultGrid.setCellValue(e.items[0],"inventType",productCodeBox[i]['param2Field']);
loadChange(grid,e,"productType"); resultGrid.setCellValue(e.items[0],"length",productCodeBox[i]['param3Field']);
// loadChange(grid,e,"quantity"); resultGrid.setCellValue(e.items[0],"width",productCodeBox[i]['param4Field']);
resultGrid.setCellValue(e.items[0],"thick",productCodeBox[i]['param5Field']);
resultGrid.setCellValue(e.items[0],"productType",productCodeBox[i]['param6Field']);
}
}
}
loadChange(grid,e,"quantity");
} }
if (e.field == "quantity") { if (e.field == "quantity") {
resultGrid.setCellValue(item, 'singleWeight', item.singleWeight); resultGrid.setCellValue(item, 'singleWeight', item.singleWeight);
......
src/main/webapp/HG/SC/HGSC004C.js
...@@ -27,7 +27,7 @@ $(function () { ...@@ -27,7 +27,7 @@ $(function () {
if (isBlank(docId)) { if (isBlank(docId)) {
return; return;
} }
NotificationUtil(ei, 'warning'); NotificationUtil(e, 'warning');
$("#fileDocId").val(docId); $("#fileDocId").val(docId);
NotificationUtil("附件上传成功"); NotificationUtil("附件上传成功");
console.log($("#fileDocId").val()) console.log($("#fileDocId").val())
......
src/main/webapp/XS/XS3002.js
...@@ -252,7 +252,9 @@ let deptCodeChange = function (e) { ...@@ -252,7 +252,9 @@ let deptCodeChange = function (e) {
} }
function refreshQuery() { function refreshQuery() {
resultGrid.dataSource.page(1); if(resultGrid.dataSource) {
resultGrid.dataSource.page(1);
}
} }
const flashUser = (userGroup) => { const flashUser = (userGroup) => {
......
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