Skip to content

Y
YX_IDENT_REFACTORING
Commit 3a634a92 authored by Administrator's avatar Administrator
Browse files
Options

修改保存任务单页面

parent c9844dae
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 31 deletions
src/main/java/com/yxproject/start/mapper/SpecialCardMapper.java
View file @ 3a634a92
...@@ -20,7 +20,7 @@ public interface SpecialCardMapper { ...@@ -20,7 +20,7 @@ public interface SpecialCardMapper {
public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo); public List<SpecialCardEntity> findSpecialCardEntityByGroupNo(String groupNo);
public List <SpecialCardEntity> findSpecialCardList(String groupNo); public List <SpecialCardEntity> findSpecialCardList(String groupNo);
public List <SpecialCardEntity> addTuiZheng(String acceptNumber); public List <SpecialCardEntity> addTuiZheng(String acceptNumber);
public List<SpecialCardEntity> addRemainingCard(String accept_Number); public List<SpecialCardEntity> addRemainingCard(String acceptNo);
public List<ProdCardEntity> getProdCard(String idNo); public List<ProdCardEntity> getProdCard(String idNo);
public List<FailedTypeEntity> getFailedType(); public List<FailedTypeEntity> getFailedType();
} }
src/main/java/com/yxproject/start/service/impl/TaskServiceImpl.java
View file @ 3a634a92
...@@ -116,6 +116,7 @@ public class TaskServiceImpl implements TaskService { ...@@ -116,6 +116,7 @@ public class TaskServiceImpl implements TaskService {
// System.out.println(taskMapper.insertTaskEntity(taskEntity)+"----测试数据--------"); // System.out.println(taskMapper.insertTaskEntity(taskEntity)+"----测试数据--------");
System.out.println(taskEntity.getTask_Id()+"-----has an unsupported-----"); System.out.println(taskEntity.getTask_Id()+"-----has an unsupported-----");
for (Map<String,Object> map : groupListAtACCU) { for (Map<String,Object> map : groupListAtACCU) {
System.out.println(map.get("GROUP_NO").toString()+"--------map.get(\"GROUP_NO\").toString()---");
GroupNoEntity groupNoEntity = new GroupNoEntity(); GroupNoEntity groupNoEntity = new GroupNoEntity();
groupNoEntity.setGroup_No(map.get("GROUP_NO").toString()); groupNoEntity.setGroup_No(map.get("GROUP_NO").toString());
groupNoEntity.setTask_Id(taskID); groupNoEntity.setTask_Id(taskID);
......
src/main/resources/mapper/GroupNoMapper.xml
View file @ 3a634a92
...@@ -58,13 +58,13 @@ from acc_group_t@accu_dblink ...@@ -58,13 +58,13 @@ from acc_group_t@accu_dblink
inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
left join (select count(SPECIAL_CARD.ACCEPT_NO) SPECIALCARDcount ,SPECIAL_CARD.GROUP_NO from SPECIAL_CARD group by SPECIAL_CARD.GROUP_NO) SPECIALCARD on acc_group_t.group_no = SPECIALCARD.GROUP_NO left join (select count(SPECIAL_CARD.ACCEPT_NO) SPECIALCARDcount ,SPECIAL_CARD.GROUP_NO from SPECIAL_CARD group by SPECIAL_CARD.GROUP_NO) SPECIALCARD on acc_group_t.group_no = SPECIALCARD.GROUP_NO
where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime} where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
and substr(original_no,0,4) = substr(#{cityCode},0,4) and substr(original_no,0,4) = substr(#{cityCode},0,4) and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
</select> </select>
<select id="findGroupNoListAtACCU" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String"> <select id="findGroupNoListAtACCU" resultType="com.yxproject.start.entity.GroupListEntity" parameterType="String">
select acc_group_t.group_no groupNo from acc_group_t@accu_dblink select acc_group_t.group_no groupNo from acc_group_t@accu_dblink
inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime} where substr(original_no,21,1)=#{typeCode} and to_char(acc_group_t.import_time,'yyyyMMdd') =#{importTime}
and substr(original_no,0,4) = substr(#{cityCode},0,4) and substr(original_no,0,4) = substr(#{cityCode},0,4) and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
</select> </select>
......
src/main/resources/mapper/TaskMapper.xml
View file @ 3a634a92
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
from acc_group_t@accu_dblink from acc_group_t@accu_dblink
inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no inner join acc_group_relation_t@accu_dblink on acc_group_t.group_no=acc_group_relation_t.group_no
left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID =substr(original_no,21,1) left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID =substr(original_no,21,1)
where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
group by substr(original_no,21,1), CARD_TYPE_DIC.CARD_TYPE group by substr(original_no,21,1), CARD_TYPE_DIC.CARD_TYPE
</select> </select>
...@@ -133,7 +133,7 @@ left join (select count(acc_group_t.group_no) groupCOUNT,substr(acc_group_relati ...@@ -133,7 +133,7 @@ left join (select count(acc_group_t.group_no) groupCOUNT,substr(acc_group_relati
group by substr(acc_group_relation_t.original_no,0,4)) group_COUNT group by substr(acc_group_relation_t.original_no,0,4)) group_COUNT
ON group_COUNT.citycode = substr(original_no,0,4) ON group_COUNT.citycode = substr(original_no,0,4)
left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on substr(CITY_DIC.CITYCODE,0,4) = substr(original_no,0,4) left join (SELECT CITYCODE,CITYNAME FROM CITY_DIC) CITY_DIC on substr(CITY_DIC.CITYCODE,0,4) = substr(original_no,0,4)
where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType} where to_char(IMPORT_TIME,'yyyyMMdd') =#{importTime} and substr(original_no,21,1) =#{cardType} and acc_group_t.group_no not in (select GROUP_NO.GROUP_NO from group_no)
group by substr(original_no,21,1), substr(original_no,0,4)||'00', CITY_DIC.CITYNAME, group_COUNT.groupCOUNT) group by substr(original_no,21,1), substr(original_no,0,4)||'00', CITY_DIC.CITYNAME, group_COUNT.groupCOUNT)
</select> </select>
......
src/main/resources/static/js/services/service.js
View file @ 3a634a92
...@@ -730,6 +730,22 @@ app.service('MessageService', function (ngDialog) { ...@@ -730,6 +730,22 @@ app.service('MessageService', function (ngDialog) {
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"} var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA)) MessageService.httpRequestFailed(JSON.stringify(errA))
}) })
},
saveTask:function(typeCode,importTime,cityCode,success){
$http({
method: 'GET',
url: "../user/saveTask" + urlTimeStamp(),
params:{
typeCode:typeCode,
importTime:importTime,
cityCode:cityCode
}
}).then(function successCallback(response) {
success(response.data)
},function(err){
var errA = {Error:true, ReturnCode:err.status, ReturnMsg:"API访问返回错误"}
MessageService.httpRequestFailed(JSON.stringify(errA))
})
} }
} }
}]) }])
\ No newline at end of file
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.html
View file @ 3a634a92
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<td>{{city.state}}</td> <td>{{city.state}}</td>
<td ng-if="userState<=4"><a ng-click="showTable(city.citycode,city.taskId)">组号列表</a></td> <td ng-if="userState<=4"><a ng-click="showTable(city.citycode,city.taskId)">组号列表</a></td>
<td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td> <td ng-if="userState>4"><a ng-click="showTableCounty(city.taskId)">区县列表</a></td>
<td><a ng-click="finishClick(city.taskId,userState)">完成</a></td> <td><a ng-click="finishClick(city.taskId,userState,city.citycode)">完成</a></td>
</tr> </tr>
<tr ng-show="showtable==city.taskId && userState<=4"> <tr ng-show="showtable==city.taskId && userState<=4">
<td></td> <td></td>
...@@ -156,21 +156,21 @@ ...@@ -156,21 +156,21 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<footer class="panel-footer"> <!--<footer class="panel-footer">-->
<div class="row"> <!--&lt;!&ndash;<div class="row">&ndash;&gt;-->
<div class="col-sm-4 text-right text-center-xs"> <!--&lt;!&ndash;<div class="col-sm-4 text-right text-center-xs">&ndash;&gt;-->
<ul class="pagination pagination-sm m-t-none m-b-none"> <!--&lt;!&ndash;<ul class="pagination pagination-sm m-t-none m-b-none">&ndash;&gt;-->
<li><a href><i class="fa fa-chevron-left"></i></a></li> <!--&lt;!&ndash;<li><a href><i class="fa fa-chevron-left"></i></a></li>&ndash;&gt;-->
<li><a href>1</a></li> <!--&lt;!&ndash;<li><a href>1</a></li>&ndash;&gt;-->
<li><a href>2</a></li> <!--&lt;!&ndash;<li><a href>2</a></li>&ndash;&gt;-->
<li><a href>3</a></li> <!--&lt;!&ndash;<li><a href>3</a></li>&ndash;&gt;-->
<li><a href>4</a></li> <!--&lt;!&ndash;<li><a href>4</a></li>&ndash;&gt;-->
<li><a href>5</a></li> <!--&lt;!&ndash;<li><a href>5</a></li>&ndash;&gt;-->
<li><a href><i class="fa fa-chevron-right"></i></a></li> <!--&lt;!&ndash;<li><a href><i class="fa fa-chevron-right"></i></a></li>&ndash;&gt;-->
</ul> <!--&lt;!&ndash;</ul>&ndash;&gt;-->
</div> <!--&lt;!&ndash;</div>&ndash;&gt;-->
</div> <!--&lt;!&ndash;</div>&ndash;&gt;-->
</footer> <!--</footer>-->
</div> </div>
</div> </div>
</div> </div>
......
src/main/resources/static/tpl/layout/cycleSheet/cycleSheet.js
View file @ 3a634a92
...@@ -5,8 +5,8 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -5,8 +5,8 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
} else { } else {
$state.go("layout.cycleSheet") $state.go("layout.cycleSheet")
} }
// $scope.userState = $rootScope.loginData.workshop; $scope.userState = $rootScope.loginData.workshop;
$scope.userState=1; // $scope.userState=1;
var getNowFormatDate = function () { var getNowFormatDate = function () {
var date = new Date(); var date = new Date();
...@@ -128,7 +128,6 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -128,7 +128,6 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
} }
} }
console.log("--查看card type- -",$scope.cardType)
getCityListData($scope.cardType,$scope.userState); getCityListData($scope.cardType,$scope.userState);
// 查询组号列表 // 查询组号列表
...@@ -137,7 +136,6 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -137,7 +136,6 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
if ($scope.userState==1){ if ($scope.userState==1){
console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----") console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----")
HttpService.getGroupListAtACCU(citycode,$scope.cardType,$scope.date,function (data) { HttpService.getGroupListAtACCU(citycode,$scope.cardType,$scope.date,function (data) {
$scope.groupList = data.respData; $scope.groupList = data.respData;
console.log($scope.groupList,"=====组号列表====") console.log($scope.groupList,"=====组号列表====")
}) })
...@@ -312,7 +310,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -312,7 +310,7 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
// "task_State_Id": 1 // "task_State_Id": 1
// }, // },
// ] // ]
//
// $scope.groupList = [ // $scope.groupList = [
// { // {
// "groupNO": 45, // "groupNO": 45,
...@@ -400,12 +398,20 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f ...@@ -400,12 +398,20 @@ app.controller('cycleSheetCtrl', ['$scope', '$rootScope', '$http', '$state', '$f
}) })
} }
$scope.finishClick = function (taskId, userState) { $scope.finishClick = function (taskId, userState,citycode) {
var state =parseInt(userState); var state =parseInt(userState);
HttpService.updateProductionTask(taskId, state+1, function (success) { if (state==1){
//点击确认成功后 再次查询城市列表 console.log(citycode,"----------",$scope.cardType,"-----",$scope.date,"-----citycode,$scope.cardType,$scope.date-----")
getCityListData(cardType,state+1 ); HttpService.saveTask($scope.cardType,$scope.date,citycode,function (success){
}) getTypeListData(state);
getCityListData($scope.cardType,state+1 );
})
} else {
HttpService.updateProductionTask(taskId, state+1, function (success) {
//点击确认成功后 再次查询城市列表
getCityListData($scope.cardType,state+1 );
})
}
} }
// $scope.folds = [ // $scope.folds = [
......
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