Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/pda/dao/RollDao.java

@@ -116,4 +116,13 @@ public interface RollDao {
 	 * @return [com.gaotao.modules.pda.entity.RollInfo]
 	 **/
 	List<RollInfo> getRollInfoByPartNo(RollInfo rollInfo);
+
+	/**
+	 * @Author sxm
+	 * @Description 修改卷的状态
+	 * @Date 2022/4/22 16:55
+	 * @Param
+	 * @return
+	 **/
+	void updateRollStatus(String rollNo, String status);
 }

src/main/java/com/gaotao/modules/pda/dao/impl/RollDaoImpl.java

@@ -215,4 +215,13 @@ public class RollDaoImpl implements RollDao {
 
         return parameterJdbcTemplate.query(sql.toString(), paramMap, new BeanPropertyRowMapper<>(RollInfo.class));
     }
+
+    @Override
+    public void updateRollStatus(String rollNo, String status) {
+        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";
+        parameterJdbcTemplate.update(sql, params);
+    }
 }

src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java

@@ -224,6 +224,8 @@ public class DumpServiceImpl implements DumpService {
 				double nums = Double.parseDouble(currentRollSap.get("nums").toString())+rollQty;
 				currentRollSap.put("nums", nums);
 			}
+			// 修改卷的状态
+			rollDao.updateRollStatus(rollNo,"D");
 			responseData.setCode("0");
 			}else{
 				responseData.setCode("1");
@@ -303,6 +305,8 @@ public class DumpServiceImpl implements DumpService {
 		}else{
 			dumpToSap.remove(site+"-"+partNo);
 		}
+		// 修改卷的状态
+		rollDao.updateRollStatus(rollNo,"I");
 		responseData.setCode("0");
 		return responseData;
 	}
@@ -519,6 +523,7 @@ public class DumpServiceImpl implements DumpService {
 	}
 
 	@Override
+	@Transactional
 	public ResponseData goBackHome(HttpSession session) {
 		ResponseData responseData = new ResponseData();
 		//1.恢复扫码标记
@@ -541,6 +546,10 @@ public class DumpServiceImpl implements DumpService {
 		Map<String, String> dumpRollNos = (Map<String, String>) session.getAttribute("dumpRollNos");
 		if(null!=dumpRollNos){
 			session.removeAttribute("dumpRollNos");
+			// 还原扫描卷的状态
+			for (String key:dumpRollNos.keySet()){
+				rollDao.updateRollStatus(key,"I");
+			}
 		}
 		//7.移除卷号统计map
 		Map<String, String> dumpRollCounts = (Map<String, String>) session.getAttribute("dumpRollCounts");
@@ -559,6 +568,8 @@ public class DumpServiceImpl implements DumpService {
 		}
 		//10.移除提交标记
 		session.removeAttribute("dump_submit_flag");
+
+
 		responseData.setCode("0");
 		return responseData;
 	}

src/main/resources/mapper/purchasingManagement/MaterialSplitMapper.xml

@@ -156,7 +156,7 @@
         SourceType,OriginalRollNo,OrderRef5,rolltype,rolltype_db,firstlevelrollno,remark,parttype_flag,
         CustomerID,FGPartNo,Ref_SupplierID,Ref_PartDesc,warehouseid) values
         (#{site},#{rollNo},#{rollQty},#{partNo},#{supplierID},#{orderRef1},#{orderRef2},#{orderRef3},#{orderRef4},
-        #{suppDeliveryNote},#{rollDate},#{createdDate},#{createdBy},#{statusDb},#{status},#{suppRollNo},#{rollSeqNo},#{suppRollNoFlag},
+        #{suppDeliveryNote},#{rollDate},#{createdDate},#{createdBy},#{statusDb},#{status},'',#{rollSeqNo},#{suppRollNoFlag},
         #{sourceType},#{originalRollNo},#{orderRef5},#{rolltype},#{rolltypeDb},#{firstlevelrollno},#{remark},#{parttypeFlag},
         #{customerID},#{fGPartNo},#{refSupplierID},#{refPartDesc},#{warehouseid})
     </insert>

src/main/resources/static/pda/js/receipt/receipt_order.js

@@ -51,6 +51,7 @@ function scanRollNo(rollNo){
 			}
 		},
 		error : function(data) {
+
 		}
 	});
 }