Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
H
huazheng-project-flink
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
huazheng
huazheng-project-flink
Commits
743692a9
提交
743692a9
authored
11月 25, 2020
作者:
guofeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
销售合同流程明细表、销售预测流程明细表、样品结案流程明细表、样品申请流程明细表更新
上级
a425d062
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
284 行增加
和
25 行删除
+284
-25
CheckDeleteServiceImpl.java
...roject/greenplum/service/impl/CheckDeleteServiceImpl.java
+0
-0
CheckUpdateServiceImpl.java
...roject/greenplum/service/impl/CheckUpdateServiceImpl.java
+0
-0
DeleteUpdateJobServiceImpl.java
...ct/greenplum/service/impl/DeleteUpdateJobServiceImpl.java
+0
-0
SapMapper.java
...main/java/com/huazheng/project/hana/mapper/SapMapper.java
+3
-3
CrmMapper.java
...ain/java/com/huazheng/project/mssql/mapper/CrmMapper.java
+19
-0
SampleClosingProcess.java
...om/huazheng/project/mssql/model/SampleClosingProcess.java
+0
-1
TmsMapper.java
...ain/java/com/huazheng/project/mysql/mapper/TmsMapper.java
+8
-0
TransformHistoryNode.java
...om/huazheng/project/mysql/model/TransformHistoryNode.java
+1
-0
SapMapper_hana.xml
src/main/resources/mapper/hana/SapMapper_hana.xml
+0
-1
CrmMapper_mssql.xml
src/main/resources/mapper/mssql/CrmMapper_mssql.xml
+0
-0
TmsMapper_mysql.xml
src/main/resources/mapper/mysql/TmsMapper_mysql.xml
+65
-2
spring-init.xml
src/main/resources/spring-init.xml
+188
-18
没有找到文件。
src/main/java/com/huazheng/project/greenplum/service/impl/CheckDeleteServiceImpl.java
浏览文件 @
743692a9
差异被折叠。
点击展开。
src/main/java/com/huazheng/project/greenplum/service/impl/CheckUpdateServiceImpl.java
浏览文件 @
743692a9
差异被折叠。
点击展开。
src/main/java/com/huazheng/project/greenplum/service/impl/DeleteUpdateJobServiceImpl.java
浏览文件 @
743692a9
差异被折叠。
点击展开。
src/main/java/com/huazheng/project/hana/mapper/SapMapper.java
浏览文件 @
743692a9
...
...
@@ -89,7 +89,7 @@ public interface SapMapper {
// .........
public
List
<
Knkk
>
selectKnkkCheckByUpdate
(
Knkk
knkk
);
// 按天更新
public
List
<
Aufk
>
selectAufkCheckByUpdate
(
Aufk
aufk
);
public
List
<
Bkpf
>
selectBkpfCheckByUpdate
(
Bkpf
bkpf
);
public
List
<
Kna1
>
selectKna1CheckUpdate
(
Kna1
kna1
);
...
...
@@ -101,7 +101,7 @@ public interface SapMapper {
public
List
<
Zsd06
>
selectZsd06CheckByUpdate
(
Zsd06
zsd06
);
public
List
<
Zsdfhzl
>
selectZsdfhzlCheckByUpdate
(
Zsdfhzl
zsdfhzl
);
public
List
<
Mara
>
selectMaraCheckByUpdate
(
Mara
mara
);
// 按天更新的级联
public
Afko
cascadeAfkoByAufk
(
Aufk
aufk
);
public
Afpo
cascadeAfpoByAufk
(
Aufk
aufk
);
public
List
<
Knvv
>
cascadeKnvvByKna1
(
Kna1
kna1
);
...
...
@@ -117,7 +117,6 @@ public interface SapMapper {
// ......
public
Bkpf
selectBkpfById
(
Bkpf
target
);
public
Knvp
selectKnvpById
(
Knvp
target
);
...
...
@@ -156,5 +155,6 @@ public interface SapMapper {
public
Vbap
selectVbapById
(
Vbap
target
);
public
Tvkbt
selectTvkbtById
(
Tvkbt
target
);
}
src/main/java/com/huazheng/project/mssql/mapper/CrmMapper.java
浏览文件 @
743692a9
...
...
@@ -23,6 +23,23 @@ public interface CrmMapper {
public
List
<
SalesContractProcessMX
>
selectSalesContractProcessMX
(
SalesContractProcess
scp
);
public
List
<
SalesForecastProcessMX
>
selectSalesForecastProcessMX
(
SalesForecastProcess
scp
);
// 按天更新
public
List
<
SalesContractProcess
>
selectSalesContractProcessCheckByUpdate
(
SalesContractProcess
scp
);
public
List
<
SalesForecastProcess
>
selectSalesForecastProcessCheckByUpdate
(
SalesForecastProcess
sfp
);
public
List
<
SampleApplicationProcess
>
selectSampleApplicationProcessCheckByUpdate
(
SampleApplicationProcess
scp
);
public
List
<
SampleClosingProcess
>
selectSampleClosingProcessCheckByUpdate
(
SampleClosingProcess
scp
);
// 按天更新的级联
public
List
<
SalesContractProcessMX
>
cascadeSalesContractProcessMXBySalesContractProcess
(
SalesContractProcess
source
);
public
List
<
SalesForecastProcessMX
>
cascadeSalesForecastProcessMXBySalesForecastProcess
(
SalesForecastProcess
source
);
public
List
<
SampleApplicationProcessMingXi
>
cascadeSampleApplicationProcessMingXiBySampleApplicationProcess
(
SampleApplicationProcess
source
);
public
List
<
SampleClosingProcessMingXi
>
cascadeSampleClosingProcessMingXiBySampleClosingProcess
(
SampleClosingProcess
source
);
public
SalesContractProcess
selectSalesContractProcessById
(
SalesContractProcess
target
);
public
SalesContractProcessMX
selectSalesContractProcessMXById
(
SalesContractProcessMX
target
);
public
SalesForecastProcess
selectSalesForecastProcessById
(
SalesForecastProcess
target
);
...
...
@@ -32,4 +49,6 @@ public interface CrmMapper {
public
SampleClosingProcess
selectSampleClosingProcessById
(
SampleClosingProcess
target
);
public
SampleClosingProcessMingXi
selectSampleClosingProcessMingXiById
(
SampleClosingProcessMingXi
target
);
}
src/main/java/com/huazheng/project/mssql/model/SampleClosingProcess.java
浏览文件 @
743692a9
package
com
.
huazheng
.
project
.
mssql
.
model
;
import
java.io.Serializable
;
import
java.util.Date
;
import
org.springframework.format.annotation.DateTimeFormat
;
...
...
src/main/java/com/huazheng/project/mysql/mapper/TmsMapper.java
浏览文件 @
743692a9
...
...
@@ -14,6 +14,14 @@ public interface TmsMapper {
public
List
<
TransformNewNode
>
selectTransformNewNodeNew
(
TransformNewNode
tnn
);
public
List
<
Handover
>
selectHandoverNew
(
Handover
handover
);
// 按天更新
public
List
<
TransformHistoryNode
>
selectTransformHistoryNodeCheckByUpdate
(
TransformHistoryNode
obj
);
public
List
<
HandoverTask
>
selectHandoverTaskCheckByUpdate
(
HandoverTask
obj
);
public
List
<
TransformNewNode
>
selectTransformNewNodeCheckByUpdate
(
TransformNewNode
obj
);
public
List
<
Handover
>
selectHandoverCheckByUpdate
(
Handover
obj
);
public
Handover
selectHandoverById
(
Handover
target
);
public
HandoverTask
selectHandoverTaskById
(
HandoverTask
target
);
public
TransformNewNode
selectTransformNewNodeById
(
TransformNewNode
target
);
...
...
src/main/java/com/huazheng/project/mysql/model/TransformHistoryNode.java
浏览文件 @
743692a9
...
...
@@ -25,6 +25,7 @@ public class TransformHistoryNode implements Serializable {
private
String
task_no
;
// 送货单号
private
Date
last_commit_time
;
// 最后提交时间
private
Integer
second_node
;
// 第二个节点
private
Date
modified_time
;
// 修改时间
private
boolean
exist
;
// 用于标记,不是字段
private
String
hashResult
;
// 数据hash标记
...
...
src/main/resources/mapper/hana/SapMapper_hana.xml
浏览文件 @
743692a9
...
...
@@ -575,7 +575,6 @@
from ${hana_user}.Bkpf
where mandt = #{mandt} and bukrs = #{bukrs} and belnr = #{belnr} and gjahr = #{gjahr}
</select>
<select
id=
"selectLipsById"
parameterType=
"Lips"
resultType=
"Lips"
>
select
vbeln, posnr, vgbel, vgpos, mandt, matnr, matkl, arktx, werks, lgort,
...
...
src/main/resources/mapper/mssql/CrmMapper_mssql.xml
浏览文件 @
743692a9
差异被折叠。
点击展开。
src/main/resources/mapper/mysql/TmsMapper_mysql.xml
浏览文件 @
743692a9
...
...
@@ -4,7 +4,7 @@
<select
id=
"selectTransformHistoryNodeNew"
parameterType=
"TransformHistoryNode"
resultType=
"TransformHistoryNode"
>
select
id, task_no, last_commit_time, second_node
id, task_no, last_commit_time, second_node
,modified_time
from transform_history_node
where id
>
#{id}
limit 20
...
...
@@ -58,6 +58,69 @@
limit 20
</select>
<!-- modified_time是新追加的,调试的时候要注意 -->
<select
id=
"selectTransformHistoryNodeCheckByUpdate"
parameterType=
"TransformHistoryNode"
resultType=
"TransformHistoryNode"
>
select
id, task_no, last_commit_time, second_node, modified_time
from transform_history_node
where id
>
#{id}
AND modified_time IS NOT NULL AND DATE_FORMAT(modified_time,'%Y-%m-%d') = CURDATE()
limit 20
</select>
<select
id=
"selectHandoverTaskCheckByUpdate"
parameterType=
"HandoverTask"
resultType=
"HandoverTask"
>
select
a.task_id, a.task_no, a.task_type, a.task_state, a.f_plant, a.plant, a.customer_id,
customer_name, a.kunnr, a.actual_handover_num, a.receipt_state, a.receipt_time,
cost_state, a.cost_handle_time, a.handover_print_state, a.last_print_time,
appearance_state, a.appearance_time, a.company_id, a.company_no, a.company_name,
netweight_count, a.weight_count, a.handover_direct_count, a.transport_type, a.vehicle_type,
delivery_cost, a.delivery_date, a.sign_time, a.area_name, a.area_id, a.port, a.delivery_type,
dispatch_type, a.piece_count, a.remark, a.is_valid, a.created_user_id, a.created_time,
modified_user_id, a.modified_time, a.receipt_remark,b.s12,b.s21,b.s24
from handover_task a
LEFT JOIN (
SELECT
task_no,
MAX(IF(second_node='12',last_commit_time,NULL)) AS s12,
MAX(IF(second_node='21',last_commit_time,NULL)) AS s21,
MAX(IF(second_node='24',last_commit_time,NULL)) AS s24
FROM transform_history_node
GROUP BY task_no
) b ON a.task_no = b.task_no
where a.task_id
>
#{task_id}
AND a.modified_time IS NOT NULL AND DATE_FORMAT(a.modified_time,'%Y-%m-%d') = CURDATE()
limit 20
</select>
<select
id=
"selectTransformNewNodeCheckByUpdate"
parameterType=
"TransformNewNode"
resultType=
"TransformNewNode"
>
select id, task_id, task_no, vehicle_no, last_commit_time, first_node, second_node,
vehicle_type, driver, driver_phone, location, exception_comment, comit_type,
exception_type, exception_picture, is_valid, lon, lat, created_user_id,
created_time, modified_user_id, modified_time
from transform_new_node
where id
>
#{id}
AND modified_time IS NOT NULL AND DATE_FORMAT(modified_time,'%Y-%m-%d') = CURDATE()
limit 20
</select>
<select
id=
"selectHandoverCheckByUpdate"
parameterType=
"Handover"
resultType=
"Handover"
>
select
vbeln, task_id, handover_id, handover_type, order_type, task_no, sale_no,
delivery_type, handover_state, f_plant, plant, customer_id, customer_name,
fmenge, delivery_num, port, piect_total, total_net_weight, weight_total,
settlement_weight, weight_state, vrkme, average_freight, order_remark,
delivery_time, erdat, plan_product_time, open_ready_time, already_ready_time,
appearance_time, sign_time, edatu, area_no, area_name, fmenge_time, klabc,
sales_man, sales_department, is_valid, created_user_id, created_time,
modified_user_id, modified_time, remark, is_auto_created, delivery_state,
operate_tag, transport_time, is_date_success, is_num_success, is_sign_success,
weighing_weight, delivery_issued_time
from handover
where handover_id
>
#{handover_id}
AND modified_time IS NOT NULL AND DATE_FORMAT(modified_time,'%Y-%m-%d') = CURDATE()
limit 20
</select>
<select
id=
"selectHandoverById"
parameterType=
"Handover"
resultType=
"Handover"
>
select
vbeln, task_id, handover_id, handover_type, order_type, task_no, sale_no,
...
...
@@ -103,7 +166,7 @@
from transform_new_node where id = #{id}
</select>
<select
id=
"selectTransformHistoryNodeById"
parameterType=
"TransformHistoryNode"
resultType=
"TransformHistoryNode"
>
select id, task_no, last_commit_time, second_node
select id, task_no, last_commit_time, second_node
, modified_time
from transform_history_node where id = #{id}
</select>
...
...
src/main/resources/spring-init.xml
浏览文件 @
743692a9
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论