From 9355f0450ec5787ce0cf856a85bc34a43efbd792 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Thu, 5 May 2022 14:52:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E5=82=A8=E5=8D=95=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B902=202022-05-05=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gaotao/modules/pda/dao/RollDao.java |  2 +-
 .../gaotao/modules/pda/dao/impl/RollDaoImpl.java | 16 +++++++++++++---
 .../gaotao/modules/pda/data/InRollInfoData.java  | 10 ++++++++++
 .../pda/service/impl/DumpServiceImpl.java        |  7 ++++---
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/pda/dao/RollDao.java b/src/main/java/com/gaotao/modules/pda/dao/RollDao.java
index 8a3675e..0ab214a 100644
--- a/src/main/java/com/gaotao/modules/pda/dao/RollDao.java
+++ b/src/main/java/com/gaotao/modules/pda/dao/RollDao.java
@@ -124,5 +124,5 @@ public interface RollDao {
 	 * @Param
 	 * @return
 	 **/
-	void updateRollStatus(String rollNo, String status);
+	void updateRollStatus(String rollNo, String status,String statusName);
 }
diff --git a/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java b/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java
index 3afdf98..2147cad 100644
--- a/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java
+++ b/src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java
@@ -4,6 +4,7 @@ package com.gaotao.modules.pda.dao.impl;
 import com.gaotao.modules.pda.dao.RollDao;
 import com.gaotao.modules.pda.data.InRollInfoData;
 import com.gaotao.modules.pda.entity.RollInfo;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
@@ -110,10 +111,18 @@ public class RollDaoImpl implements RollDao {
             paramMap.put("suppRollNoFlag", suppRollNoFlag);
         }
         String status = inData.getStatus();
-        if (null != status) {
+        String specialStatus = inData.getSpecialStatus();
+        if (null != status && StringUtils.isEmpty(specialStatus)){
             sql.append(" AND R.Status_DB = :status");
             paramMap.put("status", status);
         }
+
+        if (null != status && StringUtils.isNotEmpty(specialStatus)) {
+            sql.append(" AND ( R.Status_DB = :status OR R.Status_DB = :specialStatus)");
+            paramMap.put("specialStatus", specialStatus);
+            paramMap.put("status", status);
+        }
+
         return parameterJdbcTemplate.query(sql.toString(), paramMap, new BeanPropertyRowMapper<>(RollInfo.class));
     }
 
@@ -217,11 +226,12 @@ public class RollDaoImpl implements RollDao {
     }
 
     @Override
-    public void updateRollStatus(String rollNo, String status) {
+    public void updateRollStatus(String rollNo, String status,String statusName) {
         Map<String, Object> params = new HashMap<>();
         params.put("rollNo", rollNo);
         params.put("status", status);
-        String sql = "update C_RollInfo set Status_DB = :status Where RollNo=:rollNo";
+        params.put("statusName", statusName);
+        String sql = "update C_RollInfo set Status_DB = :status,status = :statusName Where RollNo=:rollNo";
         parameterJdbcTemplate.update(sql, params);
     }
 }
diff --git a/src/main/java/com/gaotao/modules/pda/data/InRollInfoData.java b/src/main/java/com/gaotao/modules/pda/data/InRollInfoData.java
index e25b025..63a61be 100644
--- a/src/main/java/com/gaotao/modules/pda/data/InRollInfoData.java
+++ b/src/main/java/com/gaotao/modules/pda/data/InRollInfoData.java
@@ -16,6 +16,16 @@ public class InRollInfoData {
 	private String statusDB;// 库存状态
 	private String status;// 状态
 
+	private String specialStatus; // 特殊状态,转储时使用
+
+	public String getSpecialStatus() {
+		return specialStatus;
+	}
+
+	public void setSpecialStatus(String specialStatus) {
+		this.specialStatus = specialStatus;
+	}
+
 	public InRollInfoData() {
 		// TODO Auto-generated constructor stub
 	}
diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java
index 9d1035b..df2c704 100644
--- a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java
@@ -231,7 +231,7 @@ public class DumpServiceImpl implements DumpService {
 				currentRollSap.put("nums", nums);
 			}
 			// 修改卷的状态
-			rollDao.updateRollStatus(rollNo,"D");
+			rollDao.updateRollStatus(rollNo,"X","已扫描");
 			responseData.setCode("0");
 			}else{
 				responseData.setCode("1");
@@ -312,7 +312,7 @@ public class DumpServiceImpl implements DumpService {
 			dumpToSap.remove(site+"-"+partNo);
 		}
 		// 修改卷的状态
-		rollDao.updateRollStatus(rollNo,"I");
+		rollDao.updateRollStatus(rollNo,"I","已入库");
 		responseData.setCode("0");
 		return responseData;
 	}
@@ -341,6 +341,7 @@ public class DumpServiceImpl implements DumpService {
 		}else{
 			inData.setStatus("S");
 		}
+		inData.setSpecialStatus("X");
 		//获取所有符合条件的卷号数据
 		List<RollInfo> rolls = rollDao.getRollsByCondition(inData);
 		Map<String, RollInfo> rollMap = new HashMap<>();
@@ -561,7 +562,7 @@ public class DumpServiceImpl implements DumpService {
 			session.removeAttribute("dumpRollNos");
 			// 还原扫描卷的状态
 			for (String key:dumpRollNos.keySet()){
-				rollDao.updateRollStatus(key,"I");
+				rollDao.updateRollStatus(key,"I","已入库");
 			}
 		}
 		//7.移除卷号统计map