切换导航条
此项目
正在载入...
登录
张天舒
/
statistics
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
代码片段
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
Promise
6 years ago
提交
10013359b45a2d5cde9586f044c0f1fce11900cc
1 个父辈
fc799877
更新字段并自动发送
显示空白字符变更
内嵌
并排对比
正在显示
17 个修改的文件
包含
291 行增加
和
122 行删除
statistics/.settings/org.eclipse.wst.common.component
statistics/pom.xml
statistics/src/main/java/com/tianbo/controller/DataController.java
statistics/src/main/java/com/tianbo/controller/MainController.java
statistics/src/main/java/com/tianbo/controller/PreController.java
statistics/src/main/java/com/tianbo/controller/billNo/BillController.java
statistics/src/main/java/com/tianbo/mapper/OriginmanifestmasterMapper.java
statistics/src/main/java/com/tianbo/model/Originmanifestmaster.java
statistics/src/main/java/com/tianbo/service/DataService.java
statistics/src/main/java/com/tianbo/service/imp/DataServiceImpl.java
statistics/src/main/resources/com/tianbo/mapper/FlightSettingMapper.xml
statistics/src/main/resources/com/tianbo/mapper/OriginmanifestmasterMapper.xml
statistics/src/main/resources/config/spring/applicationContext-dao.xml
statistics/src/main/webapp/WEB-INF/views/flightSetting/edit.jsp
statistics/src/main/webapp/WEB-INF/views/flightSetting/list.jsp
statistics/src/main/webapp/WEB-INF/views/transform.jsp
statistics/src/main/webapp/WEB-INF/views/updateform.jsp
statistics/.settings/org.eclipse.wst.common.component
0 → 100644
查看文件 @
1001335
<?xml version="1.0" encoding="UTF-8"?>
<project-modules
id=
"moduleCoreId"
project-version=
"1.5.0"
>
<wb-module
deploy-name=
"statistics"
>
<wb-resource
deploy-path=
"/WEB-INF/classes"
source-path=
"/src/main/java"
/>
<wb-resource
deploy-path=
"/WEB-INF/classes"
source-path=
"/src/main/resources"
/>
<wb-resource
deploy-path=
"/WEB-INF/classes"
source-path=
"/src/test/java"
/>
<wb-resource
deploy-path=
"/"
source-path=
"/src/main/webapp"
/>
<property
name=
"context-root"
value=
"statistics"
/>
<property
name=
"java-output-path"
value=
"/statistics/target/classes"
/>
</wb-module>
</project-modules>
...
...
statistics/pom.xml
查看文件 @
1001335
...
...
@@ -146,7 +146,14 @@
<dependency>
<groupId>
com.mchange
</groupId>
<artifactId>
c3p0
</artifactId>
<version>
0.9.5.1
</version>
<version>
0.9.5.2
</version>
</dependency>
<!--druid-->
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
druid
</artifactId>
<version>
1.1.12
</version>
</dependency>
<dependency>
...
...
@@ -157,7 +164,7 @@
<!--servlet/jsp api start-->
<dependency>
<!--
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
...
...
@@ -168,7 +175,7 @@
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<scope>provided</scope>
</dependency>
</dependency>
-->
<!--servlet/jsp api end-->
<!--junit4-->
...
...
statistics/src/main/java/com/tianbo/controller/DataController.java
查看文件 @
1001335
...
...
@@ -49,7 +49,11 @@ public class DataController {
return
"updateT"
;
}
@RequestMapping
(
value
=
"updateMain"
,
method
=
RequestMethod
.
POST
)
/*
* 更新空字段
*/
@RequestMapping
(
value
=
"updateNull"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
AjaxJson
updateMain
(
HttpSession
session
,
ModelMap
modelMap
,
@RequestParam
String
flightno
,
...
...
@@ -63,7 +67,8 @@ public class DataController {
Originmanifestmaster
mainfest
=
new
Originmanifestmaster
();
mainfest
.
setFlightno
(
flightno
);
mainfest
.
setFlightDate
(
flightdate
);
dataService
.
updateMain
(
mainfest
);
dataService
.
updateMain
(
mainfest
);
//更新主单空字段
dataService
.
update
(
mainfest
);
//更新分单空字段
j
.
setSuccess
(
true
);
message
=
"主单更新完毕"
;
}
catch
(
Exception
e
)
{
...
...
@@ -77,7 +82,7 @@ public class DataController {
return
j
;
}
@RequestMapping
(
value
=
"updateSecond"
,
method
=
RequestMethod
.
POST
)
/*
@RequestMapping(value = "updateSecond", method = RequestMethod.POST)
@ResponseBody
public AjaxJson updateSecond(HttpSession session,ModelMap modelMap,
@RequestParam String flightno,
...
...
@@ -104,8 +109,16 @@ public class DataController {
j.setMsg(message);
return j;
}
}
*/
/**
* 更新分单状态并手动发送
* @param session
* @param modelMap
* @param flightno
* @param flightdate
* @return
*/
@RequestMapping
(
value
=
"updateMainStatus"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
AjaxJson
updateMainStatus
(
HttpSession
session
,
ModelMap
modelMap
,
...
...
@@ -123,10 +136,10 @@ public class DataController {
dataService
.
updateMainStatus
(
mainfest
);
j
.
setSuccess
(
true
);
message
=
"
主单
状态更新完成"
;
message
=
"状态更新完成"
;
}
catch
(
Exception
e
)
{
j
.
setSuccess
(
false
);
message
=
"
主单
状态更新失败"
;
message
=
"状态更新失败"
;
e
.
printStackTrace
();
}
...
...
@@ -135,6 +148,79 @@ public class DataController {
}
/**
* 更新主单状态并自动发送
* @param session
* @param modelMap
* @param flightno
* @param flightdate
* @return
*/
@RequestMapping
(
value
=
"updateMainStatusAuto"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
AjaxJson
updateMainStatusAuto
(
HttpSession
session
,
ModelMap
modelMap
,
@RequestParam
String
flightno
,
@RequestParam
String
flightdate
)
{
String
message
=
null
;
AjaxJson
j
=
new
AjaxJson
();
try
{
Originmanifestmaster
mainfest
=
new
Originmanifestmaster
();
mainfest
.
setFlightno
(
flightno
);
mainfest
.
setFlightDate
(
flightdate
);
dataService
.
updateMainStatusAuto
(
mainfest
);
j
.
setSuccess
(
true
);
message
=
"状态更新完成"
;
}
catch
(
Exception
e
)
{
j
.
setSuccess
(
false
);
message
=
"状态更新失败"
;
e
.
printStackTrace
();
}
j
.
setMsg
(
message
);
return
j
;
}
/**
* 更新分单状态
* @param session
* @param modelMap
* @param flightno
* @param flightdate
* @return
*/
@RequestMapping
(
value
=
"updateSecondStatus"
,
method
=
RequestMethod
.
POST
)
@ResponseBody
public
AjaxJson
updateSecondStatus
(
HttpSession
session
,
ModelMap
modelMap
,
@RequestParam
String
flightno
,
@RequestParam
String
flightdate
)
{
String
message
=
null
;
AjaxJson
j
=
new
AjaxJson
();
try
{
Originmanifestmaster
mainfest
=
new
Originmanifestmaster
();
mainfest
.
setFlightno
(
flightno
);
mainfest
.
setFlightDate
(
flightdate
);
dataService
.
updateSecondStatus
(
mainfest
);
j
.
setSuccess
(
true
);
message
=
"状态更新完成"
;
}
catch
(
Exception
e
)
{
j
.
setSuccess
(
false
);
message
=
"状态更新失败"
;
e
.
printStackTrace
();
}
j
.
setMsg
(
message
);
return
j
;
}
/**
* 修改原始的航班日期
*
* @param session
...
...
statistics/src/main/java/com/tianbo/controller/MainController.java
查看文件 @
1001335
...
...
@@ -9,14 +9,9 @@ import org.apache.shiro.authz.UnauthenticatedException;
import
org.apache.shiro.subject.Subject
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.ui.Model
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
org.springframework.web.servlet.ModelAndView
;
import
javax.servlet.http.HttpServletRequest
;
/**
* Created by mrz on 2017/8/28.
...
...
statistics/src/main/java/com/tianbo/controller/PreController.java
查看文件 @
1001335
...
...
@@ -183,7 +183,8 @@ public class PreController {
public
AjaxJson
transitfestSearch
(
HttpSession
session
,
ModelMap
modelMap
,
@RequestParam
String
flightno
,
@RequestParam
String
flightdate
,
@RequestParam
String
tflightno
@RequestParam
String
tflightno
,
@RequestParam
String
tflightdate
)
{
String
message
=
null
;
...
...
@@ -193,7 +194,8 @@ public class PreController {
mainfest
.
setFlightno
(
flightno
);
mainfest
.
setFlightDate
(
flightdate
);
mainfest
.
setPreCarrier
(
tflightno
.
substring
(
0
,
2
));
mainfest
.
setPreFlightno
(
tflightno
.
substring
(
2
));
mainfest
.
setPreFlightDate
(
tflightno
.
substring
(
2
));
mainfest
.
setPreFlightDate
(
tflightdate
);
List
<
Originmanifestmaster
>
list
=
mainfestService
.
getList
(
mainfest
);
if
(
list
.
size
()!=
0
||!
list
.
isEmpty
()){
...
...
statistics/src/main/java/com/tianbo/controller/billNo/BillController.java
查看文件 @
1001335
package
com
.
tianbo
.
controller
.
billNo
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
statistics/src/main/java/com/tianbo/mapper/OriginmanifestmasterMapper.java
查看文件 @
1001335
...
...
@@ -32,6 +32,10 @@ public interface OriginmanifestmasterMapper {
void
updateStatus
(
Originmanifestmaster
mainfest
);
void
updateMainStatusAuto
(
Originmanifestmaster
mainfest
);
void
updateSecondStatus
(
Originmanifestmaster
mainfest
);
void
updateMainStatus
(
Originmanifestmaster
mainfest
);
void
updateAllStatus
(
Originmanifestmaster
mainfest
);
...
...
@@ -42,4 +46,6 @@ public interface OriginmanifestmasterMapper {
void
updateFlightDate
(
@Param
(
"flightno"
)
String
flightno
,
@Param
(
"flightdate"
)
String
flightdate
,
@Param
(
"uFlightdate"
)
String
uFlightdate
);
}
\ No newline at end of file
...
...
statistics/src/main/java/com/tianbo/model/Originmanifestmaster.java
查看文件 @
1001335
...
...
@@ -4,9 +4,11 @@ import java.util.Date;
public
class
Originmanifestmaster
{
private
String
P
reCarrier
;
private
String
p
reCarrier
;
private
String
PreFlightno
;
private
String
preFlightno
;
private
String
preFlightDate
;
private
String
autoid
;
...
...
@@ -449,18 +451,24 @@ public class Originmanifestmaster {
}
public
String
getPreFlightno
()
{
return
PreFlightno
;
}
public
void
setPreFlightno
(
String
preFlightno
)
{
PreFlightno
=
preFlightno
;
return
preFlightno
;
}
public
String
getPreCarrier
()
{
return
P
reCarrier
;
return
p
reCarrier
;
}
public
void
setPreCarrier
(
String
preCarrier
)
{
PreCarrier
=
preCarrier
;
this
.
preCarrier
=
preCarrier
;
}
public
String
getPreFlightDate
()
{
return
preFlightDate
;
}
public
void
setPreFlightDate
(
String
preFlightDate
)
{
this
.
preFlightDate
=
preFlightDate
;
}
}
\ No newline at end of file
...
...
statistics/src/main/java/com/tianbo/service/DataService.java
查看文件 @
1001335
...
...
@@ -10,6 +10,10 @@ public interface DataService {
public
void
updateMainStatus
(
Originmanifestmaster
mainfest
);
public
void
updateMainStatusAuto
(
Originmanifestmaster
mainfest
);
public
void
updateSecondStatus
(
Originmanifestmaster
mainfest
);
public
void
updateStatus
(
Originmanifestmaster
mainfest
);
public
void
updateAllMainStatus
(
Originmanifestmaster
mainfest
);
...
...
@@ -19,4 +23,6 @@ public interface DataService {
public
void
updateToT
(
Originmanifestmaster
mainfest
);
public
void
updateFlightDate
(
String
flightno
,
String
flightdate
,
String
uFlightdate
);
}
...
...
statistics/src/main/java/com/tianbo/service/imp/DataServiceImpl.java
查看文件 @
1001335
...
...
@@ -31,6 +31,17 @@ public class DataServiceImpl implements DataService {
}
@Override
public
void
updateMainStatusAuto
(
Originmanifestmaster
mainfest
)
{
MainfestDao
.
updateMainStatusAuto
(
mainfest
);
}
@Override
public
void
updateSecondStatus
(
Originmanifestmaster
mainfest
)
{
MainfestDao
.
updateSecondStatus
(
mainfest
);
}
@Override
public
void
updateStatus
(
Originmanifestmaster
mainfest
)
{
MainfestDao
.
updateStatus
(
mainfest
);
...
...
@@ -60,4 +71,7 @@ public class DataServiceImpl implements DataService {
}
}
...
...
statistics/src/main/resources/com/tianbo/mapper/FlightSettingMapper.xml
查看文件 @
1001335
...
...
@@ -31,45 +31,32 @@
select count(*) from FLIGHTSETTING
WHERE 1=1
<if
test=
"flightno != null and flightno != ''"
>
AND flightno
= #{flightno}
AND flightno
like CONCAT(CONCAT('%',#{flightno}),'%')
</if>
</select>
<select
id=
"getList"
resultType=
"com.tianbo.model.FlightSetting"
>
SELECT
*
T2.*
FROM
(
SELECT ROWNUM
rn,
ft.*
FROM
FLIGHTSETTING ft
ORDER BY ft.createdate desc
) cr
( SELECT ROWNUM RN, T.* FROM ( SELECT * FROM ( SELECT * FROM FLIGHTSETTING ) ORDER BY createdate DESC ) T ) T2
WHERE
cr.rn BETWEEN #{start} AND #{end}
RN BETWEEN #{start} AND #{end}
</select>
<select
id=
"selectByFlightno"
resultType=
"com.tianbo.model.FlightSetting"
>
SELECT
*
T2.*
FROM
(
SELECT ROWNUM
rn,
ft.*
FROM
FLIGHTSETTING ft
( SELECT ROWNUM RN, T.* FROM (
SELECT * FROM (
SELECT * FROM FLIGHTSETTING
<if
test=
"flightno != null and flightno != ''"
>
WHERE ft.flightno = #{flightno}
WHERE flightno like CONCAT(CONCAT('%',#{flightno}),'%')
</if>
ORDER BY ft.createdate desc
) cr
) ORDER BY createdate DESC ) T ) T2
WHERE
cr.rn BETWEEN #{start} AND #{end}
RN BETWEEN #{start} AND #{end}
</select>
<insert
id=
"insert"
parameterType=
"com.tianbo.model.FlightSetting"
>
...
...
statistics/src/main/resources/com/tianbo/mapper/OriginmanifestmasterMapper.xml
查看文件 @
1001335
...
...
@@ -196,9 +196,9 @@
SUBSTR( "ORIGINMANIFESTMASTER"."FLIGHTNO", 3 ) AS ORIGINAL_FLIGHTNO,
"ORIGINMANIFESTMASTER"."FLIGHT_DATE" AS ORIGINAL_FLIGHTDATE,
"ORIGINMANIFESTMASTER"."WAYBILLNOMASTER" AS ORIGINAL_BILLNO,
#{PreCarrier} AS PRE_CARRIER,
#{PreFlightno} AS PRE_FLIGHTNO,
"ORIGINMANIFESTMASTER"."FLIGHT_DATE" AS PRE_FLIGHTDATE,
#{preCarrier} AS PRE_CARRIER,
#{preFlightno} AS PRE_FLIGHTNO,
#{preFlightDate} AS PRE_FLIGHTDATE,
"ORIGINMANIFESTMASTER"."WAYBILLNOMASTER" AS PRE_BILLNO,
"ORIGINMANIFESTMASTER"."TOTALPIECE" AS BILLPIECE,
"ORIGINMANIFESTMASTER"."TOTALWEIGHT" AS BILLWEIGHT,
...
...
@@ -808,35 +808,41 @@
AND
FLIGHT_DATE = TO_DATE (#{flightDate}, 'yyyy-mm-dd'))
</update>
<update
id=
"updateMainStatus"
parameterType=
"com.tianbo.model.Originmanifestmaster"
>
UPDATE ORIGINMANIFESTMASTER SET STATUS='17' WHERE AUTOID IN (
SELECT
MESSAGEAUTOID
FROM
"SENDLOG"
WHERE
MESSAGEAUTOID IN (
SELECT
AUTOID
FROM
ORIGINMANIFESTMASTER
UPDATE ORIGINMANIFESTMASTER
SET
STATUS='17'
WHERE
FLIGHT_DATE = TO_DATE (#{flightDate}, 'yyyy-mm-dd')
AND
FLIGHTNO=#{flightno}
)
AND RECEIPTION LIKE '%50001%'
)
AND
( RECEIPTINFORMATION LIKE '%31143%' OR RECEIPTINFORMATION LIKE '%50001%' OR RECEIPTINFORMATION LIKE '%11104%' )
</update>
<update
id=
"updateAllMainStatus"
parameterType=
"com.tianbo.model.Originmanifestmaster"
>
UPDATE ORIGINMANIFESTMASTER SET STATUS='17' WHERE AUTOID IN (
SELECT
MESSAGEAUTOID
FROM
"SENDLOG"
<update
id=
"updateMainStatusAuto"
parameterType=
"com.tianbo.model.Originmanifestmaster"
>
UPDATE ORIGINMANIFESTMASTER
SET
STATUS='01'
WHERE
MESSAGEAUTOID IN (
FLIGHT_DATE = TO_DATE (#{flightDate}, 'yyyy-mm-dd')
AND
FLIGHTNO=#{flightno}
AND
( RECEIPTINFORMATION LIKE '%31143%' OR RECEIPTINFORMATION LIKE '%50001%' OR RECEIPTINFORMATION LIKE '%11104%' )
</update>
<update
id=
"updateSecondStatus"
parameterType=
"com.tianbo.model.Originmanifestmaster"
>
UPDATE ORIGINMANIFESTSECONDARY
SET STATUS = '17'
WHERE (
RECEIPTION LIKE '%50001%'
OR RECEIPTION LIKE '%31143%'
OR RECEIPTION LIKE '%11104%'
OR RECEIPTION LIKE '%50002%'
)
AND ORIGINMANIFESTMASTERAUTOID IN (
SELECT
AUTOID
FROM
...
...
@@ -846,15 +852,16 @@
AND
FLIGHTNO=#{flightno}
)
)
</update>
<update
id=
"updateFlightDate"
>
UPDATE ORIGINMANIFESTMASTER
SET FLIGHT_DATE = TO_DATE (#{uFlightdate}, 'yyyy-mm-dd')
SET
FLIGHT_DATE = TO_DATE (#{uFlightdate}, 'yyyy-mm-dd')
WHERE
FLIGHTNO=#{flightno}
AND FLIGHT_DATE = TO_DATE(#{flightdate}, 'yyyy-mm-dd')
AND
FLIGHT_DATE = TO_DATE(#{flightdate}, 'yyyy-mm-dd')
</update>
...
...
statistics/src/main/resources/config/spring/applicationContext-dao.xml
查看文件 @
1001335
...
...
@@ -9,8 +9,8 @@
<context:property-placeholder
location=
"classpath:config/jdbc.properties"
/>
<!--设置数据源c3p0-->
<bean
id=
"dataSource"
class=
"com.mchange.v2.c3p0.ComboPooledDataSource"
destroy-method=
"close"
>
<!-- <bean id="dataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource" destroy-method="close">
<property name="driverClass" value="${jdbc.driver}"/>
<property name="jdbcUrl" value="${jdbc.url}"/>
<property name="user" value="${jdbc.username}"/>
...
...
@@ -18,6 +18,37 @@
<property name="maxPoolSize" value="50"/>
<property name="minPoolSize" value="2"/>
<property name="maxIdleTime" value="60"/>
</bean> -->
<!--设置数据源druid-->
<bean
id=
"dataSource"
class=
"com.alibaba.druid.pool.DruidDataSource"
init-method=
"init"
destroy-method=
"close"
>
<!-- 数据源驱动类可不写,Druid默认会自动根据URL识别DriverClass -->
<property
name=
"driverClassName"
value=
"${jdbc.driver}"
/>
<!-- 基本属性 url、user、password -->
<property
name=
"url"
value=
"${jdbc.url}"
/>
<property
name=
"username"
value=
"${jdbc.username}"
/>
<property
name=
"password"
value=
"${jdbc.password}"
/>
<!-- 配置初始化大小、最小、最大 -->
<property
name=
"initialSize"
value=
"1"
/>
<property
name=
"minIdle"
value=
"3"
/>
<property
name=
"maxActive"
value=
"60"
/>
<!-- 配置获取连接等待超时的时间 -->
<property
name=
"maxWait"
value=
"60000"
/>
<!-- 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 -->
<property
name=
"timeBetweenEvictionRunsMillis"
value=
"60000"
/>
<!-- 配置一个连接在池中最小生存的时间,单位是毫秒 -->
<property
name=
"minEvictableIdleTimeMillis"
value=
"300000"
/>
<property
name=
"validationQuery"
value=
"select 1 from dual"
/>
<property
name=
"testWhileIdle"
value=
"true"
/>
<property
name=
"testOnBorrow"
value=
"false"
/>
<property
name=
"testOnReturn"
value=
"false"
/>
</bean>
<!--sqlsessionFactory bean-->
...
...
statistics/src/main/webapp/WEB-INF/views/flightSetting/edit.jsp
查看文件 @
1001335
...
...
@@ -80,7 +80,7 @@
<div
class=
"layui-inline"
>
<label
class=
"layui-form-label"
>
跨天数
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"
text
"
id=
"crossdatys"
name=
"crossdatys"
autocomplete=
"off"
class=
"layui-input"
>
<input
type=
"
number
"
id=
"crossdatys"
name=
"crossdatys"
autocomplete=
"off"
class=
"layui-input"
>
</div>
</div>
</div>
...
...
@@ -94,7 +94,7 @@
<div
class=
"layui-inline"
>
<label
class=
"layui-form-label"
>
星期
</label>
<div
class=
"layui-input-inline"
>
<input
type=
"
text
"
id=
"week"
name=
"week"
autocomplete=
"off"
class=
"layui-input"
>
<input
type=
"
number
"
id=
"week"
name=
"week"
autocomplete=
"off"
class=
"layui-input"
>
</div>
</div>
</div>
...
...
statistics/src/main/webapp/WEB-INF/views/flightSetting/list.jsp
查看文件 @
1001335
...
...
@@ -5,43 +5,54 @@
%>
<!doctype html>
<html
lang=
"zh"
>
<head>
<meta
charset=
"utf-8"
>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1"
>
<title>
航班
日期修改
</title>
<title>
航班
跨天配置
</title>
<
%--
<link
href=
"<%=basePath %>static/css/login.css"
rel=
"stylesheet"
>
--%>
<
%--
<link
rel=
"stylesheet"
href=
"<%=basePath %>/static/css/main.css"
/>
--%>
<script
src=
"<%=basePath %>static/easyui/jquery.min.js"
></script>
<link
href=
"<%=basePath %>static/layui2.4.5/css/layui.css"
rel=
"stylesheet"
>
<script
src=
"<%=basePath %>static/layui2.4.5/layui.js"
></script>
<script
type=
"text/javascript"
src=
"<%=basePath %>static/layer-v3.0.3/layer/layer.js"
></script>
</head>
<body>
<div
class=
"demoTable"
>
<body
align=
'center'
>
<!-- <ul class="layui-nav layui-bg-blue">
<li class="layui-nav-item">新舱单系统航班跨天配置</li>
</ul> -->
<div>
</div>
<div>
航班号:
<div
class=
"layui-inline"
>
<input
class=
"layui-input"
style=
"text-transform:uppercase;"
name=
"flightno"
id=
"flightno"
autocomplete=
"off"
onkeyup=
"if (this.value != this.value.toUpperCase()) this.value=this.value.toUpperCase();"
>
</div>
<button
class=
"layui-btn"
lay-submit=
""
id=
"searchBtn"
data-type=
"getInfo"
>
查询
</button>
<button
class=
"layui-btn"
data-type=
"reload"
id=
"add"
>
新增
</button>
</div>
<table
class=
"layui-hide"
id=
"flight"
lay-filter=
"flight"
></table>
</div>
<div
class=
"layui-inline"
>
<table
class=
"layui-hide"
id=
"flight"
lay-filter=
"flight"
style=
"width:99%;"
></table>
</div>
<
%--
<script
type=
"text/html"
id=
"toolbar"
>
<script
type=
"text/html"
id=
"toolbar"
>
<
div
class
=
"layui-btn-container"
>
<
button
class
=
"layui-btn layui-btn-sm"
>
新增
<
/button>
<
input
id
=
"searchInput"
type
=
"text"
placeholder
=
"请输入关键字"
>
<
button
class
=
"layui-btn layui-btn-sm"
>
查询
<
/button>
<
/div>
</script>
--%>
</script>
--%>
<script
type=
"text/html"
id=
"barDemo"
>
<script
type=
"text/html"
id=
"barDemo"
>
<
a
class
=
"layui-btn layui-btn-xs"
lay
-
event
=
"edit"
>
编辑
<
/a>
<
a
class
=
"layui-btn layui-btn-danger layui-btn-xs"
lay
-
event
=
"del"
>
删除
<
/a>
</script>
</script>
<script>
layui
.
use
(
'table'
,
function
(){
<script>
layui
.
use
(
'table'
,
function
(){
var
table
=
layui
.
table
;
table
.
render
({
...
...
@@ -51,8 +62,7 @@ layui.use('table', function(){
,
title
:
'航班跨天配置'
,
page
:
true
//开启分页
,
cols
:
[[
{
type
:
'checkbox'
,
fixed
:
'left'
}
,{
field
:
'flightno'
,
title
:
'航班号'
,
width
:
90
,
fixed
:
'left'
,
unresize
:
true
,
sort
:
true
}
{
field
:
'flightno'
,
title
:
'航班号'
,
width
:
100
,
fixed
:
'left'
,
unresize
:
true
,
sort
:
true
}
,{
field
:
'crossdatys'
,
title
:
'跨天数'
,
width
:
120
,
edit
:
'text'
}
,{
field
:
'originatingstation'
,
title
:
'起始站'
,
width
:
80
,
edit
:
'text'
,
sort
:
true
}
,{
field
:
'week'
,
title
:
'星期'
,
width
:
100
}
...
...
@@ -122,15 +132,14 @@ layui.use('table', function(){
var
id
=
data
.
id
;
layer
.
open
({
type
:
2
,
title
:
"航班跨天编辑"
,
//不显示标题栏
closeBtn
:
2
,
title
:
"航班跨天编辑"
,
shade
:
0.8
,
id
:
(
new
Date
()).
valueOf
(),
//设定一个id,防止重复弹出 时间戳1280977330748
moveType
:
1
,
//拖拽模式,0或者1
type
:
2
,
skin
:
'layui-layer-rim'
,
//加上边框
/* area: [window.screen.width / 2 + 'px', window.screen.height / 2 + 'px'], //宽高 */
area
:
[
'700px'
,
'26
0px'
],
area
:
[
'700px'
,
'22
0px'
],
maxmin
:
true
,
//开启最大化最小化按钮
content
:
"<%=basePath %>/flight/edit?id="
+
id
,
success
:
function
(
layero
,
index
)
{
...
...
@@ -148,7 +157,7 @@ layui.use('table', function(){
});
});
});
$
(
"#add"
).
click
(
function
(){
layer
.
open
({
type
:
2
,
...
...
@@ -172,8 +181,6 @@ layui.use('table', function(){
}
})
})
</script>
</script>
</body>
</html>
\ No newline at end of file
...
...
statistics/src/main/webapp/WEB-INF/views/transform.jsp
查看文件 @
1001335
...
...
@@ -214,6 +214,7 @@
function
transform
()
{
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
var
tflightdate
=
$
(
"#tflightdate"
).
val
();
var
tflightno
=
$
(
"#tflightno"
).
val
();
if
(
flightno
==
''
){
$
(
"#flightno"
).
focus
();
...
...
@@ -235,16 +236,24 @@
tips
:
[
1
,
'#0FA6D8'
]
//还可配置颜色
});
return
false
;
}
else
if
(
tflightdate
==
''
){
$
(
"#tflightdate"
).
focus
();
layer
.
tips
(
'请输入转运航班日期'
,
'#tflightdate'
,
{
tips
:
[
1
,
'#0FA6D8'
]
//还可配置颜色
});
return
false
;
}
else
{
layer
.
confirm
(
'您确定要进行国际转运申请吗?'
,
{
icon
:
3
,
title
:
'系统提示'
,
shade
:
false
},
function
(
index
){
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
var
tflightno
=
$
(
"#tflightno"
).
val
();
var
tflightdate
=
$
(
"#tflightdate"
).
val
();
$
.
ajax
({
url
:
"<%=basePath %>/Mainfest/Transit"
,
type
:
"POST"
,
datatype
:
"json"
,
data
:{
flightno
:
flightno
,
flightdate
:
flightdate
,
tflightno
:
tflightno
},
data
:{
flightno
:
flightno
,
flightdate
:
flightdate
,
tflight
date
:
tflightdate
,
tflight
no
:
tflightno
},
success
:
function
(
data
){
if
(
data
.
success
){
layer
.
alert
(
data
.
msg
,
function
()
{
...
...
statistics/src/main/webapp/WEB-INF/views/updateform.jsp
查看文件 @
1001335
...
...
@@ -32,22 +32,17 @@
</div>
<div
class=
"layui-col-md4"
>
<div
class=
"layui-col-md4"
>
<button
class=
""
type=
"button"
onclick=
"updateMain()"
value=
""
maxlength=
"1"
>
主单空字段
</button>
<!-- <button class="" type="button" onclick="updateMain()" value="" maxlength="1" >主单空字段</button> -->
<button
class=
""
type=
"button"
onclick=
"updateNull()"
value=
""
maxlength=
"1"
>
更新字段空值
</button>
</div>
<div
class=
"layui-col-md4"
>
<button
class=
""
type=
"button"
onclick=
"updateSecond()"
value=
""
maxlength=
"1"
>
分单空字段
</button>
<button
class=
""
type=
"button"
onclick=
"updateMainStatus()"
value=
""
maxlength=
"1"
>
更新主单状态手动发送
</button>
</div>
<div
class=
"layui-col-md4"
>
<button
class=
""
type=
"button"
onclick=
"updateMainStatus
()"
value=
""
maxlength=
"1"
>
主50001状态
</button>
<button
class=
""
type=
"button"
onclick=
"updateMainStatus
Auto()"
value=
""
maxlength=
"1"
>
更新主单状态自动发送
</button>
</div>
<div
class=
"layui-col-md4"
>
<button
class=
""
type=
"button"
onclick=
"updateAllMainStatus()"
value=
""
maxlength=
"1"
>
主单全状态
</button>
</div>
<div
class=
"layui-col-md4"
>
<button
class=
""
type=
"button"
onclick=
"updateAllStatus()"
value=
""
maxlength=
"1"
>
分单全状态
</button>
</div>
<div
class=
"layui-col-md4"
>
<button
class=
""
type=
"button"
onclick=
"updateStatus()"
value=
""
maxlength=
"1"
>
分50001状态
</button>
<button
class=
""
type=
"button"
onclick=
"updateSecondStatus()"
value=
""
maxlength=
"1"
>
更新分单状态
</button>
</div>
</div>
</div>
...
...
@@ -80,7 +75,7 @@
});
}
function
update
Main
()
{
function
update
Null
()
{
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
...
...
@@ -99,11 +94,11 @@
});
return
false
;
}
else
{
layer
.
confirm
(
'您确定要更新
主单56号令必填字段吗?'
,
{
icon
:
3
,
title
:
'更新主单
空字段'
,
shade
:
false
},
function
(
index
){
layer
.
confirm
(
'您确定要更新
56号令必填字段吗?'
,
{
icon
:
3
,
title
:
'填充
空字段'
,
shade
:
false
},
function
(
index
){
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
$
.
ajax
({
url
:
"<%=basePath %>/Data/update
Main
"
,
url
:
"<%=basePath %>/Data/update
Null
"
,
type
:
"POST"
,
datatype
:
"json"
,
data
:{
flightno
:
flightno
,
flightdate
:
flightdate
},
...
...
@@ -192,7 +187,7 @@
});
return
false
;
}
else
{
layer
.
confirm
(
'您确定要更新
回执为50001状态的主单状态吗?'
,
{
icon
:
3
,
title
:
'50001状态主单
'
,
shade
:
false
},
function
(
index
){
layer
.
confirm
(
'您确定要更新
主单状态并手动发送吗?'
,
{
icon
:
3
,
title
:
'主单状态
'
,
shade
:
false
},
function
(
index
){
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
$
.
ajax
({
...
...
@@ -263,7 +258,7 @@
}
}
function
update
AllMainStatus
()
{
function
update
MainStatusAuto
()
{
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
...
...
@@ -282,11 +277,11 @@
});
return
false
;
}
else
{
layer
.
confirm
(
'您确定要更新主单
全部状态
吗?'
,
{
icon
:
3
,
title
:
'主单状态'
,
shade
:
false
},
function
(
index
){
layer
.
confirm
(
'您确定要更新主单
状态并自动发送
吗?'
,
{
icon
:
3
,
title
:
'主单状态'
,
shade
:
false
},
function
(
index
){
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
$
.
ajax
({
url
:
"<%=basePath %>/Data/update
AllMainStatus
"
,
url
:
"<%=basePath %>/Data/update
MainStatusAuto
"
,
type
:
"POST"
,
datatype
:
"json"
,
data
:{
flightno
:
flightno
,
flightdate
:
flightdate
},
...
...
@@ -308,7 +303,7 @@
}
}
function
update
All
Status
()
{
function
update
Second
Status
()
{
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
...
...
@@ -327,11 +322,11 @@
});
return
false
;
}
else
{
layer
.
confirm
(
'您确定要更新分单吗?'
,
{
icon
:
3
,
title
:
'分单状态'
,
shade
:
false
},
function
(
index
){
layer
.
confirm
(
'您确定要更新分单
状态
吗?'
,
{
icon
:
3
,
title
:
'分单状态'
,
shade
:
false
},
function
(
index
){
var
flightno
=
$
(
"#flightno"
).
val
();
var
flightdate
=
$
(
"#flightdate"
).
val
();
$
.
ajax
({
url
:
"<%=basePath %>/Data/update
All
Status"
,
url
:
"<%=basePath %>/Data/update
Second
Status"
,
type
:
"POST"
,
datatype
:
"json"
,
data
:{
flightno
:
flightno
,
flightdate
:
flightdate
},
...
...
请
注册
或
登录
后发表评论