Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
hg-smart
Overview
Overview
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
platform
hg-smart
Commits
7b7e5e66
Commit
7b7e5e66
authored
May 22, 2024
by
wuwenlong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生产订单bugfix
parent
cdb1d491
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
72 additions
and
42 deletions
+72
-42
ServiceHGSC005A.java
...java/com/baosight/hggp/hg/sc/service/ServiceHGSC005A.java
+2
-1
ServiceHGSC006A.java
...java/com/baosight/hggp/hg/sc/service/ServiceHGSC006A.java
+11
-1
ServiceHGSC098.java
.../java/com/baosight/hggp/hg/sc/service/ServiceHGSC098.java
+29
-11
HGSC098.xml
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC098.xml
+8
-10
HGSCTools.java
src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java
+1
-0
HGSC006.js
src/main/webapp/HG/SC/HGSC006.js
+3
-3
HGSC006.jsp
src/main/webapp/HG/SC/HGSC006.jsp
+1
-1
HGSC006A.js
src/main/webapp/HG/SC/HGSC006A.js
+11
-9
HGSC006A.jsp
src/main/webapp/HG/SC/HGSC006A.jsp
+4
-4
HGSC098.jsp
src/main/webapp/HG/SC/HGSC098.jsp
+2
-2
No files found.
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC005A.java
View file @
7b7e5e66
...
@@ -80,7 +80,8 @@ public class ServiceHGSC005A extends ServiceBase {
...
@@ -80,7 +80,8 @@ public class ServiceHGSC005A extends ServiceBase {
@OperationLogAnnotation
(
operModul
=
"生产计划详情"
,
operType
=
"排产"
,
operDesc
=
"排产"
)
@OperationLogAnnotation
(
operModul
=
"生产计划详情"
,
operType
=
"排产"
,
operDesc
=
"排产"
)
public
EiInfo
schedule
(
EiInfo
inInfo
)
{
public
EiInfo
schedule
(
EiInfo
inInfo
)
{
try
{
try
{
String
planCode
=
inInfo
.
getString
(
"inqu_status-0-planCode"
);
Map
queryMap
=
EiInfoUtils
.
getFirstRow
(
inInfo
);
String
planCode
=
MapUtils
.
getString
(
queryMap
,
"planCode"
);
HGSC005
hgsc005
=
HGSCTools
.
THGSC005
.
queryByPlanCode
(
planCode
);
HGSC005
hgsc005
=
HGSCTools
.
THGSC005
.
queryByPlanCode
(
planCode
);
this
.
checkScheduleData
(
hgsc005
);
this
.
checkScheduleData
(
hgsc005
);
int
count
=
HGSCTools
.
THGSC005A
.
schedule
(
planCode
);
int
count
=
HGSCTools
.
THGSC005A
.
schedule
(
planCode
);
...
...
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC006A.java
View file @
7b7e5e66
...
@@ -30,7 +30,7 @@ public class ServiceHGSC006A extends ServiceBase {
...
@@ -30,7 +30,7 @@ public class ServiceHGSC006A extends ServiceBase {
@OperationLogAnnotation
(
operModul
=
"生产订单详情"
,
operType
=
"查询"
,
operDesc
=
"查询"
)
@OperationLogAnnotation
(
operModul
=
"生产订单详情"
,
operType
=
"查询"
,
operDesc
=
"查询"
)
public
EiInfo
query
(
EiInfo
inInfo
)
{
public
EiInfo
query
(
EiInfo
inInfo
)
{
try
{
try
{
inInfo
=
super
.
query
(
inInfo
,
HGSC00
5A
.
QUERY
,
new
HGSC005
A
());
inInfo
=
super
.
query
(
inInfo
,
HGSC00
6A
.
QUERY
,
new
HGSC006
A
());
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
}
catch
(
PlatException
e
)
{
}
catch
(
PlatException
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
...
@@ -38,5 +38,15 @@ public class ServiceHGSC006A extends ServiceBase {
...
@@ -38,5 +38,15 @@ public class ServiceHGSC006A extends ServiceBase {
return
inInfo
;
return
inInfo
;
}
}
@OperationLogAnnotation
(
operModul
=
"生产订单详情"
,
operType
=
"派工"
,
operDesc
=
"派工"
)
public
EiInfo
assign
(
EiInfo
inInfo
)
{
try
{
inInfo
=
super
.
query
(
inInfo
,
HGSC005A
.
QUERY
,
new
HGSC005A
());
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
}
catch
(
PlatException
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
}
return
inInfo
;
}
}
}
src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC098.java
View file @
7b7e5e66
...
@@ -3,6 +3,7 @@ package com.baosight.hggp.hg.sc.service;
...
@@ -3,6 +3,7 @@ package com.baosight.hggp.hg.sc.service;
import
com.baosight.hggp.aspect.annotation.OperationLogAnnotation
;
import
com.baosight.hggp.aspect.annotation.OperationLogAnnotation
;
import
com.baosight.hggp.common.DdynamicEnum
;
import
com.baosight.hggp.common.DdynamicEnum
;
import
com.baosight.hggp.common.ProductTypeEnum
;
import
com.baosight.hggp.common.ProductTypeEnum
;
import
com.baosight.hggp.core.dao.DaoBase
;
import
com.baosight.hggp.core.enums.OrgTypeEnum
;
import
com.baosight.hggp.core.enums.OrgTypeEnum
;
import
com.baosight.hggp.core.security.UserSessionUtils
;
import
com.baosight.hggp.core.security.UserSessionUtils
;
import
com.baosight.hggp.hg.sc.domain.HGSC001
;
import
com.baosight.hggp.hg.sc.domain.HGSC001
;
...
@@ -19,6 +20,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
...
@@ -19,6 +20,7 @@ import com.baosight.iplat4j.core.ei.EiInfo;
import
com.baosight.iplat4j.core.exception.PlatException
;
import
com.baosight.iplat4j.core.exception.PlatException
;
import
com.baosight.iplat4j.core.service.impl.ServiceBase
;
import
com.baosight.iplat4j.core.service.impl.ServiceBase
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.collections.CollectionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.*
;
import
java.util.*
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -41,6 +43,9 @@ public class ServiceHGSC098 extends ServiceBase {
...
@@ -41,6 +43,9 @@ public class ServiceHGSC098 extends ServiceBase {
String
companyCode
=
inInfo
.
getString
(
"inqu_status-0-companyCode"
);
String
companyCode
=
inInfo
.
getString
(
"inqu_status-0-companyCode"
);
String
productType
=
inInfo
.
getString
(
"inqu_status-0-productType"
);
String
productType
=
inInfo
.
getString
(
"inqu_status-0-productType"
);
List
<
Org
>
orgList
=
HGXSTools
.
XsOrg
.
queryByParent
(
companyCode
,
OrgTypeEnum
.
FACTORY
.
getCode
());
List
<
Org
>
orgList
=
HGXSTools
.
XsOrg
.
queryByParent
(
companyCode
,
OrgTypeEnum
.
FACTORY
.
getCode
());
orgList
.
forEach
(
o
->
{
o
.
setFactoryCode
(
o
.
getFactoryCode
()+
"#"
+
productType
);
});
EiInfoUtils
.
addBlock
(
inInfo
,
"factory_record_block_id"
,
orgList
,
Org
.
class
);
EiInfoUtils
.
addBlock
(
inInfo
,
"factory_record_block_id"
,
orgList
,
Org
.
class
);
inInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
new
HGSC098
().
eiMetadata
);
inInfo
.
addBlock
(
EiConstant
.
resultBlock
).
addBlockMeta
(
new
HGSC098
().
eiMetadata
);
inInfo
.
set
(
"inqu_status-0-productType"
,
productType
);
inInfo
.
set
(
"inqu_status-0-productType"
,
productType
);
...
@@ -61,13 +66,10 @@ public class ServiceHGSC098 extends ServiceBase {
...
@@ -61,13 +66,10 @@ public class ServiceHGSC098 extends ServiceBase {
public
EiInfo
query
(
EiInfo
inInfo
)
{
public
EiInfo
query
(
EiInfo
inInfo
)
{
try
{
try
{
//查询项目所属公司下面的所有厂区
//查询项目所属公司下面的所有厂区
String
companyCode
=
inInfo
.
getString
(
"inqu_status-0-companyCode"
);
Map
queryMap
=
EiInfoUtils
.
getFirstRow
(
inInfo
);
String
productType
=
inInfo
.
getString
(
"inqu_status-0-productType"
);
String
companyCode
=
MapUtils
.
getString
(
queryMap
,
"companyCode"
);
List
<
Org
>
orgList
=
HGXSTools
.
XsOrg
.
queryByParent
(
companyCode
,
OrgTypeEnum
.
FACTORY
.
getCode
());
String
productType
=
MapUtils
.
getString
(
queryMap
,
"productType"
);
if
(
CollectionUtils
.
isNotEmpty
(
orgList
))
{
String
factoryCode
=
MapUtils
.
getString
(
queryMap
,
"factoryCode"
);
inInfo
.
set
(
"inqu_status-0-companyCode"
,
null
);
List
<
String
>
factoryCodes
=
orgList
.
stream
().
map
(
Org:
:
getFactoryCode
).
collect
(
Collectors
.
toList
());
inInfo
.
set
(
"inqu_status-0-factoryCodes"
,
factoryCodes
);
ProductTypeEnum
productTypeEnum
=
ProductTypeEnum
.
getEnumByCode
(
Integer
.
valueOf
(
productType
));
ProductTypeEnum
productTypeEnum
=
ProductTypeEnum
.
getEnumByCode
(
Integer
.
valueOf
(
productType
));
OrgTypeEnum
orgType
;
OrgTypeEnum
orgType
;
switch
(
productTypeEnum
)
{
switch
(
productTypeEnum
)
{
...
@@ -81,8 +83,20 @@ public class ServiceHGSC098 extends ServiceBase {
...
@@ -81,8 +83,20 @@ public class ServiceHGSC098 extends ServiceBase {
throw
new
PlatException
(
"产品类型异常!"
);
throw
new
PlatException
(
"产品类型异常!"
);
}
}
inInfo
.
set
(
"inqu_status-0-orgType"
,
orgType
.
getCode
());
inInfo
.
set
(
"inqu_status-0-orgType"
,
orgType
.
getCode
());
inInfo
.
set
(
"inqu_status-0-companyCode"
,
null
);
if
(
StringUtils
.
isBlank
(
factoryCode
))
{
List
<
Org
>
orgList
=
HGXSTools
.
XsOrg
.
queryByParent
(
companyCode
,
OrgTypeEnum
.
FACTORY
.
getCode
());
if
(
CollectionUtils
.
isNotEmpty
(
orgList
))
{
List
<
String
>
factoryCodes
=
orgList
.
stream
().
map
(
Org:
:
getFactoryCode
).
collect
(
Collectors
.
toList
());
inInfo
.
set
(
"inqu_status-0-factoryCodes"
,
factoryCodes
);
inInfo
=
super
.
query
(
inInfo
,
"HGSC098.query"
,
new
HGSC098
());
inInfo
=
super
.
query
(
inInfo
,
"HGSC098.query"
,
new
HGSC098
());
}
}
}
else
{
inInfo
.
set
(
"inqu_status-0-factoryCode"
,
factoryCode
.
split
(
"#"
)[
0
]);
inInfo
=
super
.
query
(
inInfo
,
"HGSC098.query"
,
new
HGSC098
());
inInfo
.
set
(
"inqu_status-0-factoryCode"
,
factoryCode
);
}
inInfo
.
setStatus
(
EiConstant
.
STATUS_DEFAULT
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
LogUtils
.
setDetailMsg
(
inInfo
,
e
,
"查询失败"
);
}
}
...
@@ -98,7 +112,8 @@ public class ServiceHGSC098 extends ServiceBase {
...
@@ -98,7 +112,8 @@ public class ServiceHGSC098 extends ServiceBase {
try
{
try
{
Map
queryMap
=
EiInfoUtils
.
getFirstRow
(
inInfo
);
Map
queryMap
=
EiInfoUtils
.
getFirstRow
(
inInfo
);
String
factoryCode
=
MapUtils
.
getString
(
queryMap
,
"factoryCode"
);
String
factoryCode
=
MapUtils
.
getString
(
queryMap
,
"factoryCode"
);
String
productType
=
inInfo
.
getString
(
"inqu_status-0-productType"
);
String
productType
=
factoryCode
.
split
(
"#"
)[
1
];
factoryCode
=
factoryCode
.
split
(
"#"
)[
0
];
ProductTypeEnum
productTypeEnum
=
ProductTypeEnum
.
getEnumByCode
(
Integer
.
valueOf
(
productType
));
ProductTypeEnum
productTypeEnum
=
ProductTypeEnum
.
getEnumByCode
(
Integer
.
valueOf
(
productType
));
OrgTypeEnum
orgType
;
OrgTypeEnum
orgType
;
switch
(
productTypeEnum
){
switch
(
productTypeEnum
){
...
@@ -111,9 +126,12 @@ public class ServiceHGSC098 extends ServiceBase {
...
@@ -111,9 +126,12 @@ public class ServiceHGSC098 extends ServiceBase {
default
:
default
:
throw
new
PlatException
(
"产品类型异常!"
);
throw
new
PlatException
(
"产品类型异常!"
);
}
}
List
<
Org
>
orgList
=
HGXSTools
.
XsOrg
.
queryByParent
(
factoryCode
,
orgType
.
getCode
());
Map
paramMap
=
new
HashMap
();
EiInfoUtils
.
addBlock
(
inInfo
,
"workGroup"
,
orgList
,
Org
.
class
);
paramMap
.
put
(
"factoryCode"
,
factoryCode
);
CommonMethod
.
comboBoxDefaultValue
(
inInfo
,
"depByCompany"
,
"orgEname"
,
"orgCname"
);
paramMap
.
put
(
"orgType"
,
orgType
.
getCode
());
List
<
HGSC098
>
orgList
=
dao
.
query
(
"HGSC098.query"
,
paramMap
);
EiInfoUtils
.
addBlock
(
inInfo
,
"workGroup"
,
orgList
,
HGSC098
.
class
);
CommonMethod
.
comboBoxDefaultValue
(
inInfo
,
"workGroup"
,
"groupCode"
,
"groupName"
,
"全部"
);
}
catch
(
InstantiationException
e
)
{
}
catch
(
InstantiationException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
catch
(
IllegalAccessException
e
)
{
}
catch
(
IllegalAccessException
e
)
{
...
...
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC098.xml
View file @
7b7e5e66
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<!DOCTYPE sqlMap PUBLIC "-//iBATIS.com//DTD SQL Map 2.0//EN" "http://www.ibatis.com/dtd/sql-map-2.dtd">
<sqlMap
namespace=
"H
P
SC098"
>
<sqlMap
namespace=
"H
G
SC098"
>
<select
id=
"query"
parameterClass=
"java.util.HashMap"
<select
id=
"query"
parameterClass=
"java.util.HashMap"
resultClass=
"com.baosight.h
pjx.hp.sc.domain.HP
SC098"
>
resultClass=
"com.baosight.h
ggp.hg.sc.domain.HG
SC098"
>
SELECT
SELECT
ORG_ENAME AS "groupCode",
ORG_ENAME AS "groupCode",
ORG_CNAME AS "groupName",
ORG_CNAME AS "groupName",
COMPANY_CODE AS "compan
yCode",
FACTORY_CODE AS "factor
yCode",
COMPANY_NAME AS "compan
yName"
FACTORY_NAME AS "factor
yName"
FROM
iplat
.TXSOG01
FROM
${platSchema}
.TXSOG01
WHERE 1 = 1 AND IS_DELETED = 0
WHERE 1 = 1 AND IS_DELETED = 0
AND ACCOUNT
T
_CODE = #accountCode#
AND ACCOUNT_CODE = #accountCode#
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
ORG_TYPE = #orgType#
ORG_TYPE = #orgType#
</isNotEmpty>
</isNotEmpty>
...
@@ -32,11 +32,9 @@
...
@@ -32,11 +32,9 @@
<select
id=
"count"
resultClass=
"int"
>
<select
id=
"count"
resultClass=
"int"
>
SELECT
SELECT
COUNT(*)
COUNT(*)
FROM iplat.TXSOG01
FROM ${platSchema}.TXSOG01
WHERE 1 = 1
FROM iplat.TXSOG01
WHERE 1 = 1 AND IS_DELETED = 0
WHERE 1 = 1 AND IS_DELETED = 0
AND ACCOUNT
T
_CODE = #accountCode#
AND ACCOUNT_CODE = #accountCode#
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
<isNotEmpty
prepend=
" AND "
property=
"orgType"
>
ORG_TYPE = #orgType#
ORG_TYPE = #orgType#
</isNotEmpty>
</isNotEmpty>
...
...
src/main/java/com/baosight/hggp/hg/sc/tools/HGSCTools.java
View file @
7b7e5e66
...
@@ -465,6 +465,7 @@ public class HGSCTools {
...
@@ -465,6 +465,7 @@ public class HGSCTools {
hgsc006a
.
setTechFlowName
(
o
.
getTechFlowName
());
hgsc006a
.
setTechFlowName
(
o
.
getTechFlowName
());
hgsc006a
.
setProcessCode
(
o
.
getProcessCode
());
hgsc006a
.
setProcessCode
(
o
.
getProcessCode
());
hgsc006a
.
setProcessName
(
o
.
getProcessName
());
hgsc006a
.
setProcessName
(
o
.
getProcessName
());
hgsc006a
.
setProductType
(
o
.
getProductType
());
hgsc006a
.
setProductCode
(
o
.
getProductCode
());
hgsc006a
.
setProductCode
(
o
.
getProductCode
());
hgsc006a
.
setProductName
(
o
.
getProductName
());
hgsc006a
.
setProductName
(
o
.
getProductName
());
hgsc006a
.
setPlanStartDate
(
o
.
getPlanStartDate
());
hgsc006a
.
setPlanStartDate
(
o
.
getPlanStartDate
());
...
...
src/main/webapp/HG/SC/HGSC006.js
View file @
7b7e5e66
...
@@ -33,10 +33,10 @@ $(function () {
...
@@ -33,10 +33,10 @@ $(function () {
});
});
function
showInfo
(
plan
Code
)
{
function
showInfo
(
order
Code
)
{
JSColorbox
.
open
({
JSColorbox
.
open
({
href
:
"HGSC00
5A?methodName=initLoad&inqu_status-0-planCode="
+
planCode
+
"&efParentFormEname=HGSC005
"
,
href
:
"HGSC00
6A?methodName=initLoad&inqu_status-0-orderCode="
+
orderCode
+
"&efParentFormEname=HGSC006
"
,
title
:
"<div style='text-align: center;'>生产
计划
详情</div>"
,
title
:
"<div style='text-align: center;'>生产
订单
详情</div>"
,
width
:
"90%"
,
width
:
"90%"
,
height
:
"90%"
height
:
"90%"
});
});
...
...
src/main/webapp/HG/SC/HGSC006.jsp
View file @
7b7e5e66
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
<EF:EFColumn
ename=
"createdTime"
cname=
"生产订单日期"
editType=
"date"
<EF:EFColumn
ename=
"createdTime"
cname=
"生产订单日期"
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
enable=
"true"
width=
"120"
align=
"center"
readOnly=
"true"
/>
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyyMMdd']"
enable=
"true"
width=
"120"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"orderCode"
cname=
"生产订单编号"
enable=
"true"
width=
"120"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"orderCode"
cname=
"生产订单编号"
enable=
"true"
width=
"120"
align=
"center"
readOnly=
"true"
/>
<EF:EFComboColumn
ename=
"assignStatus"
cname=
"派工状态"
width=
"80"
align=
"center"
required=
"true"
<EF:EFComboColumn
ename=
"assignStatus"
cname=
"派工状态"
width=
"80"
align=
"center"
readonly=
"true"
>
readonly=
"true"
>
<EF:EFCodeOption
codeName=
"hggp.assignStatus"
/>
<EF:EFCodeOption
codeName=
"hggp.assignStatus"
/>
</EF:EFComboColumn>
</EF:EFComboColumn>
...
...
src/main/webapp/HG/SC/HGSC006A.js
View file @
7b7e5e66
...
@@ -25,7 +25,7 @@ $(function () {
...
@@ -25,7 +25,7 @@ $(function () {
}],
}],
loadComplete
:
function
(
grid
)
{
loadComplete
:
function
(
grid
)
{
// 批量分派
// 批量分派
$
(
"#ASSIGN"
).
on
(
"click"
,
assign
);
$
(
"#
BNT_
ASSIGN"
).
on
(
"click"
,
assign
);
},
},
onSuccess
:
function
(
e
)
{
onSuccess
:
function
(
e
)
{
if
(
e
.
eiInfo
.
extAttr
.
methodName
==
'save'
||
e
.
eiInfo
.
extAttr
.
methodName
==
'delete'
){
if
(
e
.
eiInfo
.
extAttr
.
methodName
==
'save'
||
e
.
eiInfo
.
extAttr
.
methodName
==
'delete'
){
...
@@ -64,20 +64,21 @@ function assign() {
...
@@ -64,20 +64,21 @@ function assign() {
return
false
;
return
false
;
}
}
});
});
if
(
flag
)
{
let
companyCode
=
rows
[
0
].
companyCode
;
let
companyCode
=
rows
[
0
].
companyCode
;
JSColorbox
.
open
({
JSColorbox
.
open
({
href
:
"HPSC098?methodName=initLoad&inqu_status-0-companyCode="
+
companyCode
+
"&inqu_status-0-productType="
+
productType
,
href
:
"HGSC098?methodName=initLoad&inqu_status-0-companyCode="
+
companyCode
+
"&inqu_status-0-productType="
+
productType
,
title
:
"<div style='text-align: center;'>选择组织</div>"
,
title
:
"<div style='text-align: center;'>选择组织</div>"
,
width
:
"70%"
,
width
:
"70%"
,
height
:
"70%"
,
height
:
"70%"
,
callbackName
:
function
(
row
)
{
callbackName
:
function
(
row
)
{
var
info
=
new
EiInfo
()
var
info
=
new
EiInfo
()
info
.
set
(
"ids"
,
ids
.
join
(
','
));
info
.
set
(
"ids"
,
ids
.
join
(
','
));
info
.
set
(
"factoryCode"
,
row
.
factoryCode
);
info
.
set
(
"factoryCode"
,
row
.
factoryCode
);
info
.
set
(
"factoryName"
,
row
.
factoryName
);
info
.
set
(
"factoryName"
,
row
.
factoryName
);
info
.
set
(
"groupCode"
,
row
.
groupCode
);
info
.
set
(
"groupCode"
,
row
.
groupCode
);
info
.
set
(
"groupName"
,
row
.
groupName
);
info
.
set
(
"groupName"
,
row
.
groupName
);
EiCommunicator
.
send
(
"HP
SC006A"
,
"assign"
,
info
,
{
EiCommunicator
.
send
(
"HG
SC006A"
,
"assign"
,
info
,
{
onSuccess
:
function
(
ei
)
{
onSuccess
:
function
(
ei
)
{
if
(
ei
[
"status"
]
==
-
1
)
{
if
(
ei
[
"status"
]
==
-
1
)
{
NotificationUtil
(
ei
,
"error"
);
NotificationUtil
(
ei
,
"error"
);
...
@@ -95,12 +96,13 @@ function assign() {
...
@@ -95,12 +96,13 @@ function assign() {
},
{
async
:
false
});
},
{
async
:
false
});
}
}
});
});
}
}
}
function
separateAssign
(
id
){
function
separateAssign
(
id
){
JSColorbox
.
open
({
JSColorbox
.
open
({
href
:
"H
P
SC006B?methodName=initLoad&inqu_status-0-orderCode="
+
orderCode
,
href
:
"H
G
SC006B?methodName=initLoad&inqu_status-0-orderCode="
+
orderCode
,
title
:
"<div style='text-align: center;'>拆单派工</div>"
,
title
:
"<div style='text-align: center;'>拆单派工</div>"
,
width
:
"80%"
,
width
:
"80%"
,
height
:
"90%"
,
height
:
"90%"
,
...
...
src/main/webapp/HG/SC/HGSC006A.jsp
View file @
7b7e5e66
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
</script>
</script>
<head>
<head>
</head>
</head>
<EF:EFPage
title=
"生产
计划
详情"
>
<EF:EFPage
title=
"生产
订单
详情"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<EF:EFRegion
id=
"inqu"
title=
"查询条件"
>
<div
class=
"row"
>
<div
class=
"row"
>
<EF:EFInput
ename=
"inqu_status-0-orderCode"
cname=
"订单编码"
type=
"hidden"
/>
<EF:EFInput
ename=
"inqu_status-0-orderCode"
cname=
"订单编码"
type=
"hidden"
/>
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFRegion
id=
"result"
title=
"记录集"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
isFloat=
"true"
>
<EF:EFGrid
blockId=
"result"
autoDraw=
"override"
isFloat=
"true"
>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"id"
cname=
"主键"
hidden=
"true"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
locked=
"true"
enable=
"true"
width=
"1
0
0"
align=
"center"
/>
<EF:EFColumn
ename=
"operator"
cname=
"操作"
locked=
"true"
enable=
"true"
width=
"1
6
0"
align=
"center"
/>
<EF:EFColumn
ename=
"companyName"
cname=
"公司名称"
enable=
"true"
width=
"120"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"companyName"
cname=
"公司名称"
enable=
"true"
width=
"120"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"projName"
cname=
"项目名称"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"createdTime"
editType=
"date"
<EF:EFColumn
ename=
"createdTime"
editType=
"date"
...
@@ -35,10 +35,10 @@
...
@@ -35,10 +35,10 @@
<EF:EFColumn
ename=
"productName"
cname=
"产品名称"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"productName"
cname=
"产品名称"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"processName"
cname=
"工序"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"processName"
cname=
"工序"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"planEndDate"
cname=
"计划完工日期"
width=
"120"
enable=
"true"
align=
"center"
editType=
"date"
<EF:EFColumn
ename=
"planEndDate"
cname=
"计划完工日期"
width=
"120"
enable=
"true"
align=
"center"
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyy
MMdd']"
required=
"true"
/>
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyy
-MM-dd']"
/>
<EF:EFColumn
ename=
"quantity"
cname=
"订单数量"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"quantity"
cname=
"订单数量"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"assignDate"
cname=
"派工日期"
width=
"120"
enable=
"true"
align=
"center"
editType=
"date"
<EF:EFColumn
ename=
"assignDate"
cname=
"派工日期"
width=
"120"
enable=
"true"
align=
"center"
editType=
"date"
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyy
MMdd']"
required=
"true"
/>
dateFormat=
"yyyy-MM-dd"
parseFormats=
"['yyyy
-MM-dd']"
/>
<EF:EFColumn
ename=
"assignQuantity"
cname=
"派工数量"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"assignQuantity"
cname=
"派工数量"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"unassignQuantity"
cname=
"待派工数量"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
<EF:EFColumn
ename=
"unassignQuantity"
cname=
"待派工数量"
width=
"120"
enable=
"true"
align=
"center"
readOnly=
"true"
/>
</EF:EFGrid>
</EF:EFGrid>
...
...
src/main/webapp/HG/SC/HGSC098.jsp
View file @
7b7e5e66
HPSC098.js
<!DOCTYPE html>
<!DOCTYPE html>
<
%@
page
contentType=
"text/html; charset=UTF-8"
%
>
<
%@
page
contentType=
"text/html; charset=UTF-8"
%
>
<
%@
taglib
uri=
"http://java.sun.com/jsp/jstl/core"
prefix=
"c"
%
>
<
%@
taglib
uri=
"http://java.sun.com/jsp/jstl/core"
prefix=
"c"
%
>
<
%@
taglib
prefix=
"EF"
tagdir=
"/WEB-INF/tags/EF"
%
>
<
%@
taglib
prefix=
"EF"
tagdir=
"/WEB-INF/tags/EF"
%
>
...
@@ -18,7 +18,7 @@ HPSC098.js<!DOCTYPE html>
...
@@ -18,7 +18,7 @@ HPSC098.js<!DOCTYPE html>
<EF:EFCascadeSelect
cascadeFrom=
"inqu_status-0-factoryCode"
cname=
"工作组"
ename=
"inqu_status-0-groupCode"
<EF:EFCascadeSelect
cascadeFrom=
"inqu_status-0-factoryCode"
cname=
"工作组"
ename=
"inqu_status-0-groupCode"
colWidth=
"4"
required=
"true"
filter=
"contains"
defaultValue=
""
colWidth=
"4"
required=
"true"
filter=
"contains"
defaultValue=
""
serviceName=
"HGSC098"
methodName=
"workGroupComboBox"
resultId=
"workGroup"
serviceName=
"HGSC098"
methodName=
"workGroupComboBox"
resultId=
"workGroup"
textField="
orgCname" valueField="orgEnam
e" >
textField=
"
groupName"
valueField=
"groupCod
e"
>
</EF:EFCascadeSelect>
</EF:EFCascadeSelect>
</div>
</div>
</EF:EFRegion>
</EF:EFRegion>
...
...
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