Commit b2a253d0 authored by Administrator's avatar Administrator

下载装箱单并连接盈信库

更新异常状态并更新异常信息
更新出库时间和入库时间
parent 14857152
...@@ -405,7 +405,7 @@ public class UserApi { ...@@ -405,7 +405,7 @@ public class UserApi {
* @return * @return
*/ */
@RequestMapping("updatePutinstorageDate") @RequestMapping("updatePutinstorageDate")
@RequiresPermissions("userInfo.add")//权限管理; // @RequiresPermissions("userInfo.add")//权限管理;
public String updatePutinstorageDate(@RequestParam("id") String id, HttpServletResponse resp) { public String updatePutinstorageDate(@RequestParam("id") String id, HttpServletResponse resp) {
String map = "{\"production_Task_List_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} "; String map = "{\"production_Task_List_Id\":\"20181016001\",\"make_Type\":8,\"old_Make_Type\":8,} ";
JSONObject jsonObject = JSONObject.fromObject(map); JSONObject jsonObject = JSONObject.fromObject(map);
......
package com.yxproject.start.entity; package com.yxproject.start.entity;
import javax.persistence.*; import javax.persistence.*;
import java.util.List;
import java.util.Objects; import java.util.Objects;
/** /**
...@@ -66,7 +65,7 @@ public class CountyListInfoEntity { ...@@ -66,7 +65,7 @@ public class CountyListInfoEntity {
@Basic @Basic
@Column(name = "IN_STORAGE_COUNT", nullable = true, precision = 0) @Column(name = "IN_STORAGE_COUNT", nullable = true, precision = 0)
public Long getInStorageCount() { public int getInStorageCount() {
return in_Storage_Count; return in_Storage_Count;
} }
...@@ -76,7 +75,7 @@ public class CountyListInfoEntity { ...@@ -76,7 +75,7 @@ public class CountyListInfoEntity {
@Basic @Basic
@Column(name = "OUT_BOUND_COUNT", nullable = true, precision = 0) @Column(name = "OUT_BOUND_COUNT", nullable = true, precision = 0)
public Long getOutBoundCount() { public int getOutBoundCount() {
return out_Bound_Count; return out_Bound_Count;
} }
......
...@@ -15,7 +15,6 @@ public class GroupNoEntity { ...@@ -15,7 +15,6 @@ public class GroupNoEntity {
private long vaild_Count; private long vaild_Count;
private long invalid_Count; private long invalid_Count;
private long special_Card_Count; private long special_Card_Count;
public Long totalinvalidCount;
@Basic @Basic
@Column(name = "GROUP_ID", nullable = false, precision = 0) @Column(name = "GROUP_ID", nullable = false, precision = 0)
......
...@@ -19,5 +19,5 @@ public interface TaskMapper { ...@@ -19,5 +19,5 @@ public interface TaskMapper {
public List<TaskEntity> findTaskEntityByState(int state); public List<TaskEntity> findTaskEntityByState(int state);
public int addExceptionState(TaskEntity taskEntity); public int addExceptionState(TaskEntity taskEntity);
public int replaceExceptionInformation(TaskEntity taskEntity); public int replaceExceptionInformation(TaskEntity taskEntity);
public int totalnum (String i);
} }
...@@ -445,14 +445,16 @@ public class TaskServiceImpl implements TaskService { ...@@ -445,14 +445,16 @@ public class TaskServiceImpl implements TaskService {
*/ */
@Override @Override
public int updateOutboundDate(TaskEntity taskEntity) { public int updateOutboundDate(TaskEntity taskEntity) {
int i=0;
i= taskMapper.totalnum(i);
if (countyListInfoEntity.getOutBoundCount()=!i){
return 0;
}
else{
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
if(groupNoEntity.totalinvalidCount.equals(countyListInfoEntity.getOutBoundCount())) {
taskEntity.setOut_Storage_Date(new Date()); taskEntity.setOut_Storage_Date(new Date());
return taskMapper.updateTaskEntity(taskEntity); return taskMapper.updateTaskEntity(taskEntity);
} }
else{
return 0;
}
} }
/** /**
...@@ -462,14 +464,15 @@ public class TaskServiceImpl implements TaskService { ...@@ -462,14 +464,15 @@ public class TaskServiceImpl implements TaskService {
*/ */
@Override @Override
public int updatePutinstorageDate(TaskEntity taskEntity) { public int updatePutinstorageDate(TaskEntity taskEntity) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss"); String i;
if(groupNoEntity.totalinvalidCount.equals(countyListInfoEntity.getInStorageCount())) { i= taskMapper.totalnum(i);
if (countyListInfoEntity.getInStorageCount()=){
return 0;
}
else{ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
taskEntity.setIn_Storage_Date(new Date()); taskEntity.setIn_Storage_Date(new Date());
return taskMapper.updateTaskEntity(taskEntity); return taskMapper.updateTaskEntity(taskEntity);
} }
else{
return 0;
}
} }
/** /**
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
values (#{task_Id},#{card_Type},#{old_Card_Type},#{citycode},#{submit_Date},#{issued_Date},#{print_State},#{download_Date},#{print_Out_Date},#{position_Date},#{out_Workshop_Date},#{quality_People_Name},#{quality_Test_Date},#{exception_Information},#{out_Storage_Date},#{in_Storage_Date},#{task_State_Id},#{is_Exception},#{printer_Id}) values (#{task_Id},#{card_Type},#{old_Card_Type},#{citycode},#{submit_Date},#{issued_Date},#{print_State},#{download_Date},#{print_Out_Date},#{position_Date},#{out_Workshop_Date},#{quality_People_Name},#{quality_Test_Date},#{exception_Information},#{out_Storage_Date},#{in_Storage_Date},#{task_State_Id},#{is_Exception},#{printer_Id})
</insert> </insert>
<update id="updateProductionTask" parameterType="com.yxproject.start.entity.TaskEntity"> <update id="updateTaskEntity" parameterType="com.yxproject.start.entity.TaskEntity">
update TASK update TASK
<set> <set>
<if test="card_Type ">card_Type =#{card_Type},</if> <if test="card_Type ">card_Type =#{card_Type},</if>
...@@ -72,4 +72,8 @@ ...@@ -72,4 +72,8 @@
update TASK SET exception_Information = NULL,EXCEPTION_STATE =#{exception_State} where TASK_ID =#{task_Id} update TASK SET exception_Information = NULL,EXCEPTION_STATE =#{exception_State} where TASK_ID =#{task_Id}
</update> </update>
<select id="totalnum" resultType="com.yxproject.start.entity.TaskEntity" parameterType="String">
SELECT SUM(VAILD_COUNT)FROM TASK
</select>
</mapper> </mapper>
\ No newline at end of file
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