Skip to content

Y
YX_IDENT_beijing_auxiliary_YD
Commit 675c4f6e authored by dahai's avatar dahai
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 97c05cf3 c24ea1fc
Show whitespace changes
Inline Side-by-side
Showing with 832 additions and 19 deletions
src/main/java/com/yxproject/start/entity/CardBodyEntity.java
View file @ 675c4f6e
...@@ -2,6 +2,7 @@ package com.yxproject.start.entity; ...@@ -2,6 +2,7 @@ package com.yxproject.start.entity;
import javax.persistence.*; import javax.persistence.*;
import java.sql.Time; import java.sql.Time;
import java.util.Date;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -12,7 +13,7 @@ import java.util.Objects; ...@@ -12,7 +13,7 @@ import java.util.Objects;
@Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "") @Table(name = "CARD_BODY", schema = "YINGXIN", catalog = "")
public class CardBodyEntity { public class CardBodyEntity {
private long cardBodyId; private long cardBodyId;
private Time saveDate; private String saveDate;
private Long cardType; private Long cardType;
private Long totalCount; private Long totalCount;
private String note; private String note;
...@@ -30,11 +31,11 @@ public class CardBodyEntity { ...@@ -30,11 +31,11 @@ public class CardBodyEntity {
@Basic @Basic
@Column(name = "SAVE_DATE") @Column(name = "SAVE_DATE")
public Time getSaveDate() { public String getSaveDate() {
return saveDate; return saveDate;
} }
public void setSaveDate(Time saveDate) { public void setSaveDate(String saveDate) {
this.saveDate = saveDate; this.saveDate = saveDate;
} }
......
src/main/java/com/yxproject/start/entity/PlasticFilmEntity.java
View file @ 675c4f6e
...@@ -12,7 +12,7 @@ import java.util.Objects; ...@@ -12,7 +12,7 @@ import java.util.Objects;
@Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "") @Table(name = "PLASTIC_FILM", schema = "YINGXIN", catalog = "")
public class PlasticFilmEntity { public class PlasticFilmEntity {
private long plasticFilmId; private long plasticFilmId;
private Time saveDate; private String saveDate;
private Long totalCount; private Long totalCount;
private Long plasticFilmType; private Long plasticFilmType;
private String note; private String note;
...@@ -30,11 +30,11 @@ public class PlasticFilmEntity { ...@@ -30,11 +30,11 @@ public class PlasticFilmEntity {
@Basic @Basic
@Column(name = "SAVE_DATE") @Column(name = "SAVE_DATE")
public Time getSaveDate() { public String getSaveDate() {
return saveDate; return saveDate;
} }
public void setSaveDate(Time saveDate) { public void setSaveDate(String saveDate) {
this.saveDate = saveDate; this.saveDate = saveDate;
} }
......
src/main/resources/application.yml
View file @ 675c4f6e
...@@ -4,7 +4,7 @@ server: ...@@ -4,7 +4,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: oracle.jdbc.driver.OracleDriver driver-class-name: oracle.jdbc.driver.OracleDriver
url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin url: jdbc:oracle:thin:@192.168.10.208:1521:yingxin
username: yingxin username: yingxin
password: yingxin password: yingxin
servlet: servlet:
......
src/main/resources/static/index.html
View file @ 675c4f6e
...@@ -191,5 +191,7 @@ ...@@ -191,5 +191,7 @@
<script src="views/ReadDeliveredInfo/ReadDeliveredInfo.js"></script> <script src="views/ReadDeliveredInfo/ReadDeliveredInfo.js"></script>
<script src="views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js"></script> <script src="views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js"></script>
<script src="views/queryDeliveredReport/queryDeliveredReport.js"></script> <script src="views/queryDeliveredReport/queryDeliveredReport.js"></script>
<script src="views/insertFilm/insertFilm.js"></script>
<script src="views/insertCardBody/insertCardBody.js"></script>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/resources/static/js/app.js
View file @ 675c4f6e
...@@ -33,7 +33,9 @@ angular.module('AvatarCheck', [ ...@@ -33,7 +33,9 @@ angular.module('AvatarCheck', [
'AvatarCheck.queryQualityCheckReport', 'AvatarCheck.queryQualityCheckReport',
'AvatarCheck.ReadDeliveredInfo', 'AvatarCheck.ReadDeliveredInfo',
'AvatarCheck.saveDeliveredFailedInfo', 'AvatarCheck.saveDeliveredFailedInfo',
'AvatarCheck.queryDeliveredReport' 'AvatarCheck.queryDeliveredReport',
'AvatarCheck.insertFilm',
'AvatarCheck.insertCardBody'
]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) { ]).config(['$locationProvider', '$routeProvider', 'localStorageServiceProvider', '$qProvider',function ($locationProvider, $routeProvider, localStorageServiceProvider, $qProvider) {
$locationProvider.hashPrefix('!'); $locationProvider.hashPrefix('!');
$routeProvider.otherwise({redirectTo: '/createTaskList'}); $routeProvider.otherwise({redirectTo: '/createTaskList'});
...@@ -184,6 +186,12 @@ angular.module('AvatarCheck', [ ...@@ -184,6 +186,12 @@ angular.module('AvatarCheck', [
if($location.path()=="/queryDeliveredReport"){ if($location.path()=="/queryDeliveredReport"){
$rootScope.tab = '/queryDeliveredReport'; $rootScope.tab = '/queryDeliveredReport';
} }
if($location.path()=="/insertFilm"){
$rootScope.tab = '/insertFilm';
}
if($location.path()=="/insertCardBody"){
$rootScope.tab = '/insertCardBody';
}
......
src/main/resources/static/js/service.js
View file @ 675c4f6e
...@@ -1099,5 +1099,129 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule']) ...@@ -1099,5 +1099,129 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
}) })
}, },
queryDeliveredFailedType:function (success) {
$http({
method: 'GET',
url: "../DeliveredApi/queryDeliveredFailedType" + urlTimeStamp(),
}).then(function successCallback(response) {
success(response.data)
})
},
queryDeliveredByImportDate:function (date,success) {
$http({
method: 'GET',
url: "../DeliveredApi/queryDeliveredByImportDate" + urlTimeStamp(),
params:{
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
deleteDeliveredByFileId:function (fileid,success) {
$http({
method: 'GET',
url: "../DeliveredApi/deleteDeliveredByFileId" + urlTimeStamp(),
params:{
fileId:fileid
}
}).then(function successCallback(response) {
success(response.data)
})
},
queryDeliveredFailedByRegisterDate:function (date,success) {
$http({
method: 'GET',
url: "../DeliveredApi/queryDeliveredFailedByRegisterDate" + urlTimeStamp(),
params:{
date:date
}
}).then(function successCallback(response) {
success(response.data)
})
},
deleteDeliveredFailedById:function (id,success) {
$http({
method: 'GET',
url: "../DeliveredApi/deleteDeliveredFailedById" + urlTimeStamp(),
params:{
id:id
}
}).then(function successCallback(response) {
success(response.data)
})
},
insertFilm:function (totalCount,plasticFilmType,note,name,success) {
$http({
method: 'GET',
url: "../MaterialManagementApi/insertFilm" + urlTimeStamp(),
params:{
totalCount :totalCount,
plasticFilmType :plasticFilmType,
note:note,
name:name
}
}).then(function successCallback(response) {
success(response.data)
})
},
selectPlasticFilmManagement:function (date1, date2, plasticFilmType, name,success) {
$http({
method: 'GET',
url: "../MaterialManagementApi/selectPlasticFilmManagement" + urlTimeStamp(),
params:{
beginDate :date1,
endDate :date2,
typeCode:plasticFilmType,
name:name
}
}).then(function successCallback(response) {
success(response.data)
})
},
// String cardType,@Param("totalCount")String totalCount,@Param("note")String note, @Param("name")String name
insertCardBody:function (cardType,totalCount,note,name,success) {
$http({
method: 'GET',
url: "../MaterialManagementApi/insertCardBody" + urlTimeStamp(),
params:{
cardType :cardType,
totalCount :totalCount,
note:note,
name:name
}
}).then(function successCallback(response) {
success(response.data)
})
},
// @Param("beginDate")String beginDate,@Param("endDate")String endDate,@Param("typeCode")String typeCode,@Param("name")String name
selectCardBodyManagement:function (date1, date2, cardType, name,success) {
$http({
method: 'GET',
url: "../MaterialManagementApi/selectCardBodyManagement" + urlTimeStamp(),
params:{
beginDate :date1,
endDate :date2,
typeCode:cardType,
name:name
}
}).then(function successCallback(response) {
success(response.data)
})
},
} }
}); });
\ No newline at end of file
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.html
View file @ 675c4f6e
<div class="box">
<strong class="box-header">导入妥投信息表</strong>
<div class="box-primary"> <style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.ul li{
cursor: pointer;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box">
<strong class="box-header with-border">导入妥投信息表</strong>
<div class="box box-primary">
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <!--<tr>-->
<td>文件名称</td> <!--<td>文件名称</td>-->
<td><input type="text" ng-model="importName"/></td> <!--<td><input type="text" ng-model="importName"/></td>-->
</tr> <!--</tr>-->
<tr> <tr>
<td>选择Excel文件：</td> <td>选择Excel文件：</td>
<td colspan="2"> <td colspan="2">
...@@ -24,4 +54,50 @@ ...@@ -24,4 +54,50 @@
</tr> </tr>
</table> </table>
</div> </div>
</div>
<div class="box box-default">
<div class="box-header with-border"><strong>查询导入妥投信息</strong>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="Date" id="datepicker" readonly/>
<button class="btn btn-primary" ng-click="queryDeliveredByImportDate()">查询</button>
<!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
<!--{{paginationConf.totalItems}}条</span>)</div>-->
<div ng-if="deliveredByImportDate.length==0">
<h4>暂无数据</h4>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="deliveredByImportDate.length>0">
<thead>
<tr>
<th>流水号</th>
<th>妥投文件名</th>
<th>导入时间</th>
<th>导入人姓名</th>
<th>导入数量</th>
<th> </th>
</tr>
</thead>
<tbody>
<tr ng-repeat="item in deliveredByImportDate">
<td>{{item.id}}</td>
<td>{{item.fileName}}</td>
<td>{{item.importDate}}</td>
<td>{{item.importName}}</td>
<td>{{item.importCount}}</td>
<td><button class="btn btn-primary" ng-click="deleteDeliveredByFileId(item.id)">删除</button></td>
</tr>
</tbody>
</table>
<!--<div ng-if="packageLogData.length==0" class="box-body">-->
<!--<h4>暂无数据</h4>-->
<!--</div>-->
<!--<div style="padding-left: 27%;" ng-if="packageLogData.length>0">-->
<!--<tm-pagination conf="paginationConf" class="ul"></tm-pagination>-->
<!--</div>-->
</div>
</div>
</div>
</div> </div>
</div>
\ No newline at end of file
src/main/resources/static/views/ReadDeliveredInfo/ReadDeliveredInfo.js
View file @ 675c4f6e
...@@ -10,7 +10,7 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http']) ...@@ -10,7 +10,7 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
.controller('readDeliveredInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) { .controller('readDeliveredInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.ReadDeliveredInfo = function () { $scope.ReadDeliveredInfo = function () {
var importName = $scope.importName; var importName = $rootScope.loginData.name;
var fd = new FormData(); var fd = new FormData();
var files = document.querySelector('input#id_file_photo_for_check').files; var files = document.querySelector('input#id_file_photo_for_check').files;
if(files.length==0){ if(files.length==0){
...@@ -44,4 +44,44 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http']) ...@@ -44,4 +44,44 @@ angular.module("AvatarCheck.ReadDeliveredInfo",['ngRoute', 'AvatarCheck.http'])
} }
} }
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.queryDeliveredByImportDate=function () {
var date = $("#datepicker").val();
console.log(date)
HttpService.queryDeliveredByImportDate(date,function(data){
$scope.deliveredByImportDate = data;
console.log($scope.deliveredByImportDate)
})
}
$scope.deleteDeliveredByFileId=function (fileid) {
console.log(fileid);
HttpService.deleteDeliveredByFileId(fileid,function(data){
if(data==true){
MessageService.showAlert("删除成功")
}else{
MessageService.showAlert("删除失败")
}
HttpService.queryDeliveredByImportDate($("#datepicker").val(),function(data){
$scope.deliveredByImportDate = data;
console.log($scope.deliveredByImportDate)
})
})
}
}) })
\ No newline at end of file
src/main/resources/static/views/insertCardBody/insertCardBody.html 0 → 100644
View file @ 675c4f6e
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.select2-search__field {
height:30px;
}
.ul li{
cursor: pointer;
}
.table .colSpan{
column-span: 5;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">插入卡体耗材数据</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>数量:</td>
<td><input type="text" class="form-control" ng-model="totalCount" placeholder="数量"></td>
<td>备注:</td>
<td>
<input type="text" class="form-control" ng-model="note" placeholder="备注">
</td>
</tr>
<tr>
<td>卡基类型:</td>
<td>
<select class="form-control select2" ng-model="cardType">
<option value="">--请选择卡基类型--</option>
<option value="1">出库</option>
<option value="2">入库</option>
</select>
</td>
<td><div style="text-align: right;">
<button class="btn btn-primary" ng-click="insertCardBody()">提交</button>
</div></td>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header with-border">
<div><strong>查询卡基耗材统计数据</strong></div>
<!--<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>-->
<!--<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>-->
<!--<button class="btn btn-primary" ng-click="queryDeliveredByImportDate()">查询</button>-->
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td> <span>查询日期:</span></td>
<td><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
</td>
<td>卡基类型:</td>
<td>
<select class="form-control select2" ng-model="cardType2">
<option value="">--请选择卡基类型--</option>
<option value="1">出库</option>
<option value="2">入库</option>
</select>
</td>
<td><div style="text-align: right;">
<button class="btn btn-primary" ng-click="selectCardBodyManagement()">查询</button>
</div></td>
</tr>
</table>
<!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
<!--{{paginationConf.totalItems}}条</span>)</div>-->
<div ng-if="cardBodyManagement.cardBody.length==0">
<h4>暂无数据</h4>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="cardBodyManagement.cardBody.length>0">
<thead>
<tr>
<th>卡基统计信息表ID</th>
<th>保存时间</th>
<th>数量</th>
<th>卡基类型</th>
<th>备注</th>
<th>提交人</th>
<!--<th>出库总数</th>-->
<!--<th>入库总数</th>-->
</tr>
</thead>
<tbody>
<tr ng-repeat="item in cardBodyManagement.cardBody">
<td>{{item.cardBodyId}}</td>
<td>{{item.saveDate}}</td>
<td>{{item.totalCount}}</td>
<!--<td>-->
<!--({{item.cardType}}==1)?出库:入库-->
<!---->
<!--</td>-->
<td ng-if="item.cardType==1">出库</td>
<td ng-if="item.cardType==2">入库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<!--<td>{{item.plasticFilmCount1}}</td>-->
<!--<td>{{item.plasticFilmCount2}}</td>-->
</tr>
<tr>
<th>合计</th>
<td class="colSpan" colspan="2" ng-if="cardType2==1" >{{cardBodyManagement.cardCount1}}</td>
<td class="colSpan" colspan="2" ng-if="cardType2==2" >{{cardBodyManagement .cardCount2}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/insertCardBody/insertCardBody.js 0 → 100644
View file @ 675c4f6e
'use strict';
angular.module("AvatarCheck.insertCardBody",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/insertCardBody', {
templateUrl: 'views/insertCardBody/insertCardBody.html' + urlTimeStamp(),
controller: 'insertCardBodyContr',
cache: false
});
}])
.controller('insertCardBodyContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.insertCardBody = function () {
var totalCount = $scope.totalCount;
var note = $scope.note;
var cardType = $scope.cardType;
var name = $rootScope.loginData.name;
console.log(totalCount,note,cardType,name)
if ($scope.cardType == null) {
MessageService.showAlert("请选择卡基类型")
} else {
HttpService.insertCardBody(cardType,totalCount, note, name, function (data) {
if(data==false){
MessageService.showAlert("插入失败")
}else{
MessageService.showAlert("插入成功")
}
console.log(data)
})
}
}
$scope.selectCardBodyManagement=function(){
var cardType = $scope.cardType2;
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var name = $rootScope.loginData.name;
if (cardType==null){
MessageService.showAlert("请选择卡基类型")
}else{
HttpService.selectCardBodyManagement(date1, date2, cardType, name, function (data) {
$scope.cardBodyManagement = data;
console.log(data)
})
}
}
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
})
\ No newline at end of file
src/main/resources/static/views/insertFilm/insertFilm.html 0 → 100644
View file @ 675c4f6e
<style>
.table th, .table td {
text-align: center;
vertical-align: middle!important;
}
.select2-search__field {
height:30px;
}
.ul li{
cursor: pointer;
}
.page-list .pagination {float:left;}
.page-list .pagination span {cursor: pointer;}
.page-list .pagination .separate span{cursor: default; border-top:none;border-bottom:none;}
.page-list .pagination .separate span:hover {background: none;}
.page-list .page-total {float:left; margin: 25px 20px;}
.page-list .page-total input, .page-list .page-total select{height: 26px; border: 1px solid #ddd;}
.page-list .page-total input {width: 40px; padding-left:3px;}
.page-list .page-total select {width: 50px;}
.page-list:after {
display: block;
clear: both;
content: ""
}
.page-list{
zoom: 1
}
</style>
<div class="content row">
<div class="col-md-12" style="margin-top:20px;">
<div class="box ">
<strong class="box-header">插入膜耗材</strong>
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td>数量:</td>
<td><input type="text" class="form-control" ng-model="totalCount" placeholder="数量"></td>
<td>备注:</td>
<td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
</tr>
<tr>
<td>膜类型:</td>
<td>
<select class="form-control select2" ng-model="plasticFilmType">
<option value="">--请选择膜类型--</option>
<option value="1">出库</option>
<option value="2">入库</option>
</select>
</td>
<td><div style="text-align: right;">
<button class="btn btn-primary" ng-click="insertFilm()">提交</button>
</div></td>
</tr>
</table>
</div>
</div>
<div class="box box-default">
<div class="box-header with-border">
<div><strong>查询膜耗材统计数据</strong></div>
<!--<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>-->
<!--<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>-->
<!--<button class="btn btn-primary" ng-click="queryDeliveredByImportDate()">查询</button>-->
<div class="box box-primary">
<table class="table table-bordered" style="margin-bottom: 0;">
<tr>
<td> <span>查询日期:</span></td>
<td><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="startDate" id="datepicker1" readonly/> <span>至</span>
<input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="endDate" id="datepicker2" readonly/>
</td>
<td>膜类型:</td>
<td>
<select class="form-control select2" ng-model="plasticFilmType2">
<option value="">--请选择膜类型--</option>
<option value="1">出库</option>
<option value="2">入库</option>
</select>
</td>
<td><div style="text-align: right;">
<button class="btn btn-primary" ng-click="selectPlasticFilmManagement()">查询</button>
</div></td>
</tr>
</table>
<!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
<!--{{paginationConf.totalItems}}条</span>)</div>-->
<div ng-if="plasticFilmdata.plasticFilm.length==0">
<h4>暂无数据</h4>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="plasticFilmdata.plasticFilm.length>0">
<thead>
<tr>
<th>塑料膜表流水号</th>
<th>保存时间</th>
<th>数量</th>
<th>膜类型</th>
<th>备注</th>
<th>提交人</th>
<!--<th>出库总数</th>-->
<!--<th>入库总数</th>-->
</tr>
</thead>
<tbody>
<tr ng-repeat="item in plasticFilmdata.plasticFilm">
<td>{{item.plasticFilmId}}</td>
<td>{{item.saveDate}}</td>
<td>{{item.totalCount}}</td>
<td ng-if="item.plasticFilmType==1">出库</td>
<td ng-if="item.plasticFilmType==2">入库</td>
<td>{{item.note}}</td>
<td>{{item.name}}</td>
<!--<td>{{item.plasticFilmCount1}}</td>-->
<!--<td>{{item.plasticFilmCount2}}</td>-->
</tr>
<tr>
<th>合计</th>
<td colspan="2" ng-if="plasticFilmType2==1" >{{plasticFilmdata.plasticFilmCount1}}</td>
<td colspan="2" ng-if="plasticFilmType2==2" >{{plasticFilmdata.plasticFilmCount2}}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
src/main/resources/static/views/insertFilm/insertFilm.js 0 → 100644
View file @ 675c4f6e
'use strict';
angular.module("AvatarCheck.insertFilm",['ngRoute', 'AvatarCheck.http'])
.config(['$routeProvider', function ($routeProvider){
$routeProvider.when('/insertFilm', {
templateUrl: 'views/insertFilm/insertFilm.html' + urlTimeStamp(),
controller: 'insertFilmContr',
cache: false
});
}])
.controller('insertFilmContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
$scope.insertFilm = function () {
var totalCount = $scope.totalCount;
var note = $scope.note;
var plasticFilmType = $scope.plasticFilmType;
var name = $rootScope.loginData.name;
if ($scope.plasticFilmType == null) {
MessageService.showAlert("请选择膜类型")
} else {
HttpService.insertFilm(totalCount, plasticFilmType, note, name, function (data) {
if(data==false){
MessageService.showAlert("插入失败")
}else{
MessageService.showAlert("插入成功")
}
console.log(data)
})
}
}
$scope.selectPlasticFilmManagement=function(){
var plasticFilmType = $scope.plasticFilmType2;
var date1 = $("#datepicker1").val();
var date2 = $("#datepicker2").val();
var name = $rootScope.loginData.name;
if ($scope.plasticFilmType2==null){
MessageService.showAlert("请选择膜类型")
}else{
HttpService.selectPlasticFilmManagement(date1, date2, plasticFilmType, name, function (data) {
$scope.plasticFilmdata = data;
console.log(data)
})
}
}
//Date picker
$('#datepicker1').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
//Date picker
$('#datepicker2').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
})
\ No newline at end of file
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.html
View file @ 675c4f6e
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
</tr> </tr>
<tr> <tr>
<td>退回原因:</td> <td>退回原因:</td>
<td><input type="text" class="form-control" ng-model="backReason" placeholder="退回原因"></td> <td>
<select class="form-control select2" ng-model="backReason">
<option value="">--请选择退回原因--</option>
<option ng-repeat="item in backReasonList" value="{{item.id}}">{{item.reason}}</option>
</select>
</td>
<td>备注:</td> <td>备注:</td>
<td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td> <td><input type="text" class="form-control" ng-model="note" placeholder="备注"></td>
...@@ -55,5 +60,52 @@ ...@@ -55,5 +60,52 @@
</table> </table>
</div> </div>
</div> </div>
<div class="box box-default">
<div class="box-header with-border"><strong>查询登记妥投失败信息</strong>
<span>查询日期:</span><input type="text" style="height: 30px;margin-right: 10px;border-radius: 4px;background-color: #eee;cursor: not-allowed;border: 1px solid #ccc;" ng-model="Date" id="datepicker" readonly/>
<button class="btn btn-primary" ng-click="queryDeliveredFailedByRegisterDate()">查询</button>
<!--(<span style="color:#0b93d5;">每页显示{{paginationConf.itemsPerPage}}条/共-->
<!--{{paginationConf.totalItems}}条</span>)</div>-->
<div ng-if="deliveredFailedByRegisterDate.length==0">
<h4>暂无数据</h4>
</div>
<div class="box-info" style="padding: 7px;padding-top: 0px;">
<table class="table table-bordered table-hover postTable" ng-if="deliveredFailedByRegisterDate.length>0">
<thead>
<tr>
<th>流水号</th>
<th>登记人姓名</th>
<th>运单号</th>
<th>备注</th>
<th>退回原因</th>
<th>身份证号码</th>
<th></th>
</tr>
</thead>
<tbody>
<!--REGISTER_NAME: "qwdqw", WAYBILL_NUMBER: "4", NOTE: "3", BACK_REASON: 1, CARD_ID: "adqwd",-->
<tr ng-repeat="item in deliveredFailedByRegisterDate">
<td>{{item.ID}}</td>
<td>{{item.REGISTER_NAME}}</td>
<td>{{item.WAYBILL_NUMBER}}</td>
<td>{{item.NOTE}}</td>
<td>{{item.REASON}}</td>
<td>{{item.CARD_ID}}</td>
<td><button class="btn btn-primary" ng-click="deleteDeliveredFailedById(item.ID)">删除</button></td>
</tr>
</tbody>
</table>
<!--<div ng-if="packageLogData.length==0" class="box-body">-->
<!--<h4>暂无数据</h4>-->
<!--</div>-->
<!--<div style="padding-left: 27%;" ng-if="packageLogData.length>0">-->
<!--<tm-pagination conf="paginationConf" class="ul"></tm-pagination>-->
<!--</div>-->
</div>
</div>
</div>
</div> </div>
</div> </div>
\ No newline at end of file
src/main/resources/static/views/saveDeliveredFailedInfo/saveDeliveredFailedInfo.js
View file @ 675c4f6e
...@@ -8,11 +8,32 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht ...@@ -8,11 +8,32 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
}); });
}]) }])
.controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) { .controller('saveDeliveredFailedInfoContr', function ($scope, $rootScope, $timeout, HttpService, $filter, $interval, MessageService, ngDialog) {
HttpService.queryDeliveredFailedType(function(data) {
console.log(data)
$scope.backReasonList = data;
})
//Date picker
$('#datepicker').datetimepicker({
minView: "month", //选择日期后，不会再跳转去选择时分秒
language: 'zh-CN',
format: 'yyyy-mm-dd',
todayBtn: 1,
autoclose: 1
});
$scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
//清除的代码
$(".glyphicon-remove").click(function(){
$($($(this).parent()).prev()).val("");
})
$scope.saveDeliveredFailedInfo=function () { $scope.saveDeliveredFailedInfo=function () {
var waybillNumber = $scope.waybillNumber; var waybillNumber = $scope.waybillNumber;
var registerName = $scope.registerName; var registerName = $scope.registerName;
var cardId = $scope.cardId; var cardId = $scope.cardId;
var backReason = $scope.backReason; var backReason = $scope.backReason;
if(backReason==null){
MessageService.showAlert("请选择退回原因")
}else{
var note = $scope.note; var note = $scope.note;
var arr = [{"waybillNumber":waybillNumber,"registerName":registerName,"cardId":cardId,"backReason":backReason,"note":note}]; var arr = [{"waybillNumber":waybillNumber,"registerName":registerName,"cardId":cardId,"backReason":backReason,"note":note}];
...@@ -20,10 +41,37 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht ...@@ -20,10 +41,37 @@ angular.module("AvatarCheck.saveDeliveredFailedInfo",['ngRoute', 'AvatarCheck.ht
HttpService.saveDeliveredFailedInfo(arr,function (data) { HttpService.saveDeliveredFailedInfo(arr,function (data) {
if(data==true){ if(data==true){
confirm("提交成功"); MessageService.showAlert("提交成功");
}else{
MessageService.showAlert("提交失败!!")
}
})
}
}
$scope.queryDeliveredFailedByRegisterDate=function () {
var date = $("#datepicker").val();
console.log(date)
HttpService.queryDeliveredFailedByRegisterDate(date,function(data){
$scope.deliveredFailedByRegisterDate = data;
console.log($scope.deliveredFailedByRegisterDate)
})
}
$scope.deleteDeliveredFailedById=function (id) {
console.log(id);
HttpService.deleteDeliveredFailedById(id,function(data){
if(data==true){
MessageService.showAlert("删除成功")
}else{ }else{
alert("提交失败!!") MessageService.showAlert("删除失败")
} }
HttpService.queryDeliveredFailedByRegisterDate($("#datepicker").val(),function(data){
$scope.deliveredFailedByRegisterDate = data;
console.log($scope.deliveredFailedByRegisterDate)
})
}) })
} }
......
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