pda转储 2022-06-07 sxm

src/main/java/com/gaotao/modules/pda/controller/DumpController.java

@@ -95,8 +95,8 @@ public class DumpController {
 	*/
 	@PostMapping(value="/scanRollNo")
 	@ResponseBody
-	public Object scanRollNo(HttpServletRequest request,String rollNo){
-		ResponseData responseData = dumpService.scanRollNo(request,rollNo);
+	public Object scanRollNo(HttpServletRequest request,String rollNo,String warehouseId){
+		ResponseData responseData = dumpService.scanRollNo(request,rollNo,warehouseId);
 		return responseData;
 	}
 	

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

@@ -34,7 +34,7 @@ public class RollDaoImpl implements RollDao {
         StringBuilder sql = new StringBuilder();
         sql.append("SELECT R.PartNo PartNo,P.PartDescription PartDescription,OrderRef1+'-'+OrderRef2 PONo,");
         sql.append("R.SuppRollNoFlag SuppRollNoFlag,R.SupplierID supplierID,R.RollQty rollQty,R.Status_DB status_DB,");
-        sql.append("R.OrderRef1 orderRef1,R.OrderRef3 orderRef3, R.Site site");
+        sql.append("R.OrderRef1 orderRef1,R.OrderRef3 orderRef3, R.Site site, r.WarehouseID");
         sql.append(" FROM C_RollInfo R LEFT JOIN Part P ON R.Site=P.Site AND R.PartNo=P.PartNo");
         sql.append(" WHERE R.RollNo = :rollNo");
         Map<String, Object> paramMap = new HashMap<String, Object>();
@@ -211,6 +211,10 @@ public class RollDaoImpl implements RollDao {
         if (null != site) {
             paramMap.put("status_DB", status_DB);
         }
+        String warehouseID = rollInfo.getWarehouseID();
+        if (StringUtils.isNotEmpty(warehouseID)) {
+            paramMap.put("warehouseID", warehouseID);
+        }
         sql.append("SELECT");
         sql.append("	Site ,RollNo ,RollQty ,PartNo ,SupplierID ,OrderRef1 ,OrderRef2 ,OrderRef3 ,OrderRef4 ,SuppDeliveryNote ,RollDate ,CreatedDate ,CreatedBy ");
         sql.append(",Status_DB ,Status ,SuppRollNo ,RollSeqNo ,SuppRollNoFlag ,SourceType ,OriginalRollNo ,OrderRef5 ,rolltype ,rolltype_db ,firstlevelrollno ,remark ");
@@ -218,7 +222,7 @@ public class RollDaoImpl implements RollDao {
         sql.append("FROM");
         sql.append("	C_RollInfo ");
         sql.append("WHERE");
-        sql.append("	PartNo = :partNo AND Site =:site AND Status_DB =:status_DB");
+        sql.append("	PartNo = :partNo AND Site =:site AND Status_DB =:status_DB  and warehouseid = :warehouseID");
         sql.append("	AND RollDate  <=   dateadd(DAY, CAST(dbo.get_sys_config_value('rollOutDateCheck') AS INT), ");
         sql.append("	 (SELECT MIN(RollDate) FROM C_RollInfo WHERE PartNo = :partNo and Status_DB = 'I'))	");
 

src/main/java/com/gaotao/modules/pda/service/DumpService.java

@@ -42,7 +42,7 @@ public interface DumpService {
 	* @return ResponseData    返回类型  
 	* @throws
 	*/
-	ResponseData scanRollNo(HttpServletRequest request, String rollNo);
+	ResponseData scanRollNo(HttpServletRequest request, String rollNo,String warehouseId);
 
 	/**
 	* 

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

@@ -53,7 +53,7 @@ public class DumpServiceImpl implements DumpService {
 	private PrintService printService;
 
 	@Override
-	public ResponseData scanRollNo(HttpServletRequest request, String rollNo) {
+	public ResponseData scanRollNo(HttpServletRequest request, String rollNo,String warehouseId) {
 		ResponseData responseData = new ResponseData();
 		HttpSession session = request.getSession();
 		//获取发料还是退料
@@ -93,6 +93,7 @@ public class DumpServiceImpl implements DumpService {
 			rollPart.setPartNo(rollInfo.getPartNo());
 			rollPart.setStatus_DB("I");
 			rollPart.setSite("1");
+			rollPart.setWarehouseID(warehouseId);
 			List<RollInfo> rollInfoByPartNo = rollDao.getRollInfoByPartNo(rollPart);
 			if (rollInfoByPartNo.size()>0){
 				List<RollInfo> okRollInfo = rollInfoByPartNo.stream()

src/main/resources/static/pda/js/dump/dump_page.js

@@ -23,10 +23,11 @@ $(function () {
 
 // 通过内部卷号获取信息
 function scanRollNo(rollNo) {
+    let wid = $('#partNo').val()
     $.ajax({
         url: "/dump/scanRollNo",
         type: "POST",
-        data: {rollNo: rollNo},
+        data: {rollNo: rollNo,warehouseId:wid},
         dataType: "json",
         beforeSend: function (request) {
             request.setRequestHeader("token", $.cookie("token"));