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
97c98d21
Commit
97c98d21
authored
Nov 22, 2024
by
liuyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.生产驾驶舱查询工序逻辑调整
2.设备台账保养日期隐藏 3.库存盘点提交bug修复
parent
55530798
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
49 additions
and
30 deletions
+49
-30
ServiceHGKC005.java
.../java/com/baosight/hggp/hg/kc/service/ServiceHGKC005.java
+8
-4
HGKCTools.java
src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java
+9
-0
HGSC007.xml
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
+31
-25
HGSB001.jsp
src/main/webapp/HG/SB/HGSB001.jsp
+1
-1
No files found.
src/main/java/com/baosight/hggp/hg/kc/service/ServiceHGKC005.java
View file @
97c98d21
...
...
@@ -326,6 +326,9 @@ public class ServiceHGKC005 extends ServiceEPBase {
hgkc007
.
setSource
(
InventorySource
.
INVENTORY
.
getCode
());
hgkc007
.
setSubmitStatus
(
HGConstant
.
ProductStatus
.
WTJ
);
hgkc007
.
setSourceCode
(
hgkc005
.
getCheckNo
());
AssertUtils
.
isTrue
(
Objects
.
isNull
(
hgkc007
.
getSource
())
||
hgkc007
.
getSource
()
<=
0
,
"其它出库单数据来源不能为空!"
);
AssertUtils
.
isTrue
(
StringUtils
.
isBlank
(
hgkc007
.
getWhCode
()),
"其它出库单仓库不能为空!"
);
DaoUtils
.
insert
(
HGKC007
.
INSERT
,
hgkc007
);
//明细数据处理
HGKC007A
hgkc007A
=
new
HGKC007A
();
hgkc007A
.
setPrimaryId
(
hgkc007
.
getId
());
...
...
@@ -342,16 +345,17 @@ public class ServiceHGKC005 extends ServiceEPBase {
//其他出库单的数量为正数
hgkc007A
.
setInvQty
(
hgkc005
.
getDiffAmount
().
negate
());
hgkc007A
.
setInvUnitWeight
(
hgkc005
.
getBookUnitWeight
());
hgkc007A
.
setInvWeight
(
hgkc005
.
getDiffWeight
());
hgkc007A
.
setInvWeight
(
hgkc005
.
getDiffWeight
()
.
negate
()
);
hgkc007A
.
setPrdtLength
(
hgpz005
.
getLength
());
hgkc007A
.
setPrdtWidth
(
hgpz005
.
getWidth
());
hgkc007A
.
setPrdtThick
(
hgpz005
.
getThick
());
hgkc007A
.
setPrdtSpec
(
hgpz005
.
getSpec
());
hgkc007A
.
setSource
(
InventorySource
.
INVENTORY
.
getCode
());
hgkc007A
.
setInventTypeDetail
(
hgpz005
.
getInventTypeDetail
());
hgkc007
.
getDetailList
().
add
(
hgkc007A
);
HGKCTools
.
HgKc007
.
generateHgkc007
(
hgkc007
);
HGKCTools
.
HgKc007A
.
checkData
(
hgkc007A
);
DaoUtils
.
insert
(
HGKC007A
.
INSERT
,
hgkc007A
);
//hgkc007.getDetailList().add(hgkc007A);
//HGKCTools.HgKc007.generateHgkc007(hgkc007);
}
//如果差异数量大于0则为盘盈,生成入库单
if
(
hgkc005
.
getDiffAmount
().
compareTo
(
BigDecimal
.
ZERO
)
>
0
){
...
...
src/main/java/com/baosight/hggp/hg/kc/tools/HGKCTools.java
View file @
97c98d21
...
...
@@ -941,6 +941,15 @@ public class HGKCTools {
}
return
results
;
}
public
static
void
checkData
(
HGKC007A
hgkc007a
)
{
AssertUtils
.
isTrue
(
StringUtils
.
isBlank
(
hgkc007a
.
getWhCode
()),
"其它出库单明细仓库不能为空!"
);
AssertUtils
.
isTrue
(
StringUtils
.
isBlank
(
hgkc007a
.
getInventCode
()),
"其它出库单明细存货编码不能为空!"
);
AssertUtils
.
isTrue
(
StringUtils
.
isBlank
(
hgkc007a
.
getInventName
()),
"其它出库单明细存货名称不能为空!"
);
AssertUtils
.
isTrue
(
hgkc007a
.
getInvQty
().
compareTo
(
BigDecimal
.
ZERO
)
<=
0
,
"其它出库单明细数量不能小于等于0!"
);
AssertUtils
.
isTrue
(
hgkc007a
.
getInvUnitWeight
().
compareTo
(
BigDecimal
.
ZERO
)
<=
0
,
"其它出库单明细单重小于等于0!"
);
AssertUtils
.
isTrue
(
hgkc007a
.
getInvWeight
().
compareTo
(
BigDecimal
.
ZERO
)
<=
0
,
"其它出库单明细总重小于等于0!"
);
}
}
/**
...
...
src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml
View file @
97c98d21
...
...
@@ -1018,9 +1018,9 @@
select
a.factoryCode ,
a.factoryName ,
ROUND(ifnull(sum(a.dayWt),0)/1000,
4
) as dayWeight,
ROUND(ifnull(sum(a.monthWt),0)/1000,
4
) as monthWeight,
ROUND(ifnull(sum(a.yearWt),0)/1000,
4
) as yearWeight
ROUND(ifnull(sum(a.dayWt),0)/1000,
2
) as dayWeight,
ROUND(ifnull(sum(a.monthWt),0)/1000,
2
) as monthWeight,
ROUND(ifnull(sum(a.yearWt),0)/1000,
2
) as yearWeight
from (
select
h2.factory_code as factoryCode ,
...
...
@@ -1078,7 +1078,7 @@
h2.factory_name as "factoryName",
h2.process_code as "processCode",
h2.process_name as "processName",
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000,
4
) "totalWeight"
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000,
2
) "totalWeight"
from ${hggpSchema}.hgkc003 h inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
where 1 = 1 and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
<include
refid=
"appCondition"
/>
...
...
@@ -1098,7 +1098,7 @@
h2.factory_name as "factoryName",
h2.process_code as "processCode",
h2.process_name as "processName",
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 4
) "totalWeight"
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000, 2
) "totalWeight"
from ${hggpSchema}.hgkc003 h inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
where 1 = 1 and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
<include
refid=
"appCondition"
/>
...
...
@@ -1118,7 +1118,7 @@
h2.factory_name as "factoryName",
h2.process_code as "processCode",
h2.process_name as "processName",
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000,
4
) "totalWeight"
ROUND(ifnull(SUM(h.INV_WEIGHT),0)/1000,
2
) "totalWeight"
from ${hggpSchema}.hgkc003 h inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
where 1 = 1 and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
<include
refid=
"appCondition"
/>
...
...
@@ -1136,8 +1136,8 @@
a.proj_code as projCode,
a.proj_name as projName,
a.finish_date as completeDate,
ROUND(ifnull(sum(a.total_weight),0)/1000,
4
) as totalWeight,
ROUND(ifnull(sum(a.finish_weight),0)/1000,
4
) as finishWeight,
ROUND(ifnull(sum(a.total_weight),0)/1000,
2
) as totalWeight,
ROUND(ifnull(sum(a.finish_weight),0)/1000,
2
) as finishWeight,
ifnull(sum(a.finish_weight),0) / ifnull(sum(a.total_weight),0) * 100 as schedule,
a.updated_time as updatedTime
from (
...
...
@@ -1236,10 +1236,10 @@
<!--工序日产量-->
<select
id=
"queryByWt"
parameterClass=
"java.util.HashMap"
resultClass=
"java.util.HashMap"
>
select
A.process_code as "processCode",
A.process_name as "processName",
ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000,
4
) "totalWeight"
ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000,
2
) "totalWeight"
from ${hggpSchema}.HGGY001 A
join ${platSchema}.TXSOG01 C on A.FACTORY_CODE = C.COMPANY_CODE
left join (
select
h2.process_code ,
...
...
@@ -1259,20 +1259,25 @@
<isNotEmpty
prepend=
" AND "
property=
"accountCode"
>
A.account_code = #accountCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"factoryName"
>
C.factory_name = #factoryName#
<isNotEmpty
property=
"factoryCode"
>
<isEqual
prepend=
" AND "
property=
"accountCode"
compareValue=
"Q24072514"
>
A.factory_code = 'R24072606'
</isEqual>
<isNotEqual
prepend=
" AND "
property=
"accountCode"
compareValue=
"Q24072514"
>
A.factory_code = (select distinct COMPANY_CODE from ${platSchema}.TXSOG01 where FACTORY_CODE = #factoryCode#)
</isNotEqual>
</isNotEmpty>
group by
A.process_name
A.process_
code, A.process_
name
</select>
<!--工序累计产量-->
<select
id=
"queryBySunWt"
parameterClass=
"java.util.HashMap"
resultClass=
"java.util.HashMap"
>
select
A.SORT as "sort",
A.process_code as "processCode",
A.process_name as "processName",
ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000,
4
) "totalWeight"
ROUND(ifnull(SUM(B.INV_WEIGHT),0)/1000,
2
) "totalWeight"
from ${hggpSchema}.HGGY001 A
join ${platSchema}.TXSOG01 C on A.FACTORY_CODE = C.COMPANY_CODE
left join (
select
h.COMPANY_CODE,
...
...
@@ -1280,30 +1285,31 @@
ROUND(ifnull(SUM(h.INV_WEIGHT), 0)/ 1000, 4) "INV_WEIGHT"
from ${hggpSchema}.hgkc003 h
inner join ${hggpSchema}.hgzl002 h2 on h.QUALITY_ID = h2.id
where 1 = 1
and h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
where h.DELETE_FLAG = '0' and h.SUBMIT_STATUS = '1'
<include
refid=
"appCondition"
/>
<include
refid=
"appOrderCondition"
/>
<isNotEmpty
prepend=
" AND "
property=
"depositDate"
>
left(h.DEPOSIT_DATE,6) = left(#depositDate#,6)
</isNotEmpty>
group by h.COMPANY_CODE, h2.process_code
) B on
A.FACTORY_CODE = B.COMPANY_CODE AND
A.process_code = B.process_code
where
1=1 and
DELETE_FLAG = '0' and reveal = 1
) B on A.process_code = B.process_code
where DELETE_FLAG = '0' and reveal = 1
<isNotEmpty
prepend=
" AND "
property=
"accountCode"
>
A.account_code = #accountCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"processNames"
>
A.process_name IN
<iterate
close=
")"
open=
"("
conjunction=
","
property=
"processNames"
>
#processNames[]#
</iterate>
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"factoryCode"
>
C.factory_code = #factoryCode#
</isNotEmpty>
<isNotEmpty
prepend=
" AND "
property=
"factoryName"
>
C.factory_name = #factoryName#
<isNotEmpty
property=
"factoryCode"
>
<isEqual
prepend=
" AND "
property=
"accountCode"
compareValue=
"Q24072514"
>
A.factory_code = 'R24072606'
</isEqual>
<isNotEqual
prepend=
" AND "
property=
"accountCode"
compareValue=
"Q24072514"
>
A.factory_code = (select distinct COMPANY_CODE from ${platSchema}.TXSOG01 where FACTORY_CODE = #factoryCode#)
</isNotEqual>
</isNotEmpty>
group by
A.SORT, A.process_name
A.SORT, A.process_
code, A.process_
name
order by A.SORT
</select>
<!--日期到条件7天日产量-->
...
...
src/main/webapp/HG/SB/HGSB001.jsp
View file @
97c98d21
...
...
@@ -77,7 +77,7 @@
displayType="0" sort="true" align="right" maxLength="15" required="true"
data-regex="/^-?[0-9]{1,15}?$/"
data-errorprompt="请输入数字,该值最大可设置15位整数!"/>
<EF:EFColumn ename="maintainDate" cname="保养日期" width="120" align="center" editType="date"
<EF:EFColumn ename="maintainDate" cname="保养日期" width="120" align="center" editType="date"
hidden="true"
dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" readonly="false" required="true"/>
<EF:EFComboColumn ename="deviceUserId" cname="设备负责人" defaultValue="${loginName}"
columnTemplate="#=textField#" itemTemplate="#=textField#"
...
...
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