修改

adm/src/main/java/com/minpay/guomao/stockManage/BatchPrintBillManageAction.java

@@ -505,23 +505,29 @@ public class BatchPrintBillManageAction implements IMINAction {
 			Map<String, String> maps = (Map<String, String>) tableDataArray.get(i);
 		    //获取订单号
 			String orderId = maps.get("orderId");
-	        //获取订单下的Stock 
-			ApWarehouseStockExample ea = new ApWarehouseStockExample();
-			ea.createCriteria().andOrderIdEqualTo(orderId).andStartEqualTo("00").andTypeEqualTo(conType)
-				.andWeightGreaterThanOrEqualTo("0").andBranchIdEqualTo(u.getBranchId());
-		    List<ApWarehouseStock>	stockList = 	Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApWarehouseStockMapper.class)
-		    						.selectByExample(ea);
-		    
-		    //声明list，存放stockId
-		    List<String> stockIdList = new ArrayList<>();
-		    for(int j = 0 ; j < stockList.size();j++){
-		    	if(!stockIdList.contains(stockList.get(j).getId())){//不包含放进去
-		    		stockIdList.add(stockList.get(j).getId());
-		    	}
-		    }
-		    map.put("stockIdList", CommonUtil.listToStr4InSql(stockIdList));
-	
-		    
+			// stockId
+			String stockId = maps.get("id");
+			if(CommonUtil.isEmpty(stockId)) {
+		        //获取订单下的Stock 
+				ApWarehouseStockExample ea = new ApWarehouseStockExample();
+				ea.createCriteria().andOrderIdEqualTo(orderId).andStartEqualTo("00").andTypeEqualTo(conType)
+					.andWeightGreaterThanOrEqualTo("0").andBranchIdEqualTo(u.getBranchId());
+			    List<ApWarehouseStock>	stockList = 	Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApWarehouseStockMapper.class)
+			    						.selectByExample(ea);
+			    
+			    //声明list，存放stockId
+			    List<String> stockIdList = new ArrayList<>();
+			    for(int j = 0 ; j < stockList.size();j++){
+			    	if(!stockIdList.contains(stockList.get(j).getId())){//不包含放进去
+			    		stockIdList.add(stockList.get(j).getId());
+			    	}
+			    }
+			    map.put("stockIdList", CommonUtil.listToStr4InSql(stockIdList));
+			}else {
+				List<String> stockIdList = new ArrayList<>();
+				stockIdList.add(stockId);
+				map.put("stockIdList", CommonUtil.listToStr4InSql(stockIdList));
+			}
 		    //根据stock查询明细
 		    List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class)
 					.getMybatisMapper(WarehouseStockMapper.class).selectStockByWareId(map);
@@ -564,16 +570,25 @@ public class BatchPrintBillManageAction implements IMINAction {
 		//获取第一个订单
 		Map<String, String> m = (Map<String, String>) tableDataArray.get(0);
 		String OrId =  m.get("orderId");
-		ApWarehouseStockExample ea = new ApWarehouseStockExample();
-		ea.createCriteria().andOrderIdEqualTo(OrId).andStartEqualTo("00")
+		String stockId = mapFirst.get("id");
+		
+		String wareId = "";
+		if(CommonUtil.isEmpty(stockId)) {
+			ApWarehouseStockExample ea = new ApWarehouseStockExample();
+			ea.createCriteria().andOrderIdEqualTo(OrId).andStartEqualTo("00")
 			.andTypeEqualTo(conType).andBranchIdEqualTo(u.getBranchId());
-	    List<ApWarehouseStock>	stockList = 	Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApWarehouseStockMapper.class)
-	    						.selectByExample(ea);
-	    //取stock表中的第一个仓库
-	    String wareId = "";
-	    if(stockList.size() > 0){
-	    	wareId = stockList.get(0).getWareId();
-	    }
+			List<ApWarehouseStock>	stockList = 	Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApWarehouseStockMapper.class)
+					.selectByExample(ea);
+			 //取stock表中的第一个仓库
+			   
+		    if(stockList.size() > 0){
+		    	wareId = stockList.get(0).getWareId();
+		    }
+		} else {
+			ApWarehouseStock stock = 	Service.lookup(IMINDataBaseService.class).selectByPrimaryKey(ApWarehouseStockMapper.class, stockId);
+			wareId = stock.getWareId();
+		}
+	   
 	    //仓库所属公司
 	    String wareCompanyName = "";
 	    if(!CommonUtil.isEmpty(wareId)){
@@ -591,8 +606,6 @@ public class BatchPrintBillManageAction implements IMINAction {
 	    				wareCompanyName = com.getName();
 	    			}
 	    		}
-	    		
-	    		
 	    	}
 	    }
 		res.set("hjzl", hjzl);

adm/src/main/webapp/admin/wareHouseManage/chooseWare.html

@@ -148,7 +148,7 @@
   		        	warename : warename,
   		        	comname : comname,
   		        	dates :dates,
-  		        	region:region
+  		        	region:region,
   		        	state : "00",
   		        	sellId : sellId
   		        }

adm/src/main/webapp/admin/wareHouseManage/wareHouseOutTwo.html

@@ -69,7 +69,7 @@
     <!--操作功能-->
     <script type="text/html" id="barDemo">
 		{{#  if(d.stockType != '03'){ }}
-			<a class="f12-green ml0-4" lay-event="out">打印出库单</a>
+			<a class="f12-green ml0-4" lay-event="out">打印出库单(提货单)</a>
 			<a class="f12-black3 ml0-4" lay-event="detail">查看明细</a>
 			{{#  if(d.reaWeight == 0 || isEmpty(d.reaWeight)){ }}
 				<a class="f12-blue ml0-4" lay-event="edit">编辑</a>
@@ -364,12 +364,16 @@
 		openMainTabPageParent(tabPageId+'-08', '明细', 'stockManage/enteringWarehouse.html?id='+data.id+'&tabPageId='+tabPageId+'-08'+'&stockType='+stockType+'&hide='+hide,'',tabPageId,reloadPage);	
 	}
 	function outDetail(data) {
-		var params = {};
+		/* var params = {};
 		params.columnNumber = 2; //每行显示两个字段
 	    	// 要显示的数据
 		 layui.sessionData("ROW_DATA", {key:"NOW_ROW", value:data});
-		 openMainTabPageParent(tabPageId+'-10', '打印出库单', 'wareHouseManage/outPrintlv.html?id='+data.id+'&tabPageId='+tabPageId+'-10'+'&conType='+conType,'',tabPageId,reloadPage);	
-
+		 openMainTabPageParent(tabPageId+'-10', '打印出库单', 'wareHouseManage/outPrintlv.html?id='+data.id+'&tabPageId='+tabPageId+'-10'+'&conType='+conType,'',tabPageId,reloadPage);	 */
+		let datas = new Array();
+		datas.push(data);
+		setTempVal('batchPrintOut', datas);
+	    var orderName = encodeURI(encodeURI(data.orderName));
+	    openMainTabPageParent(tabPageId+'-10', '打印出库单（提货单）', 'stockManage/enteringWarehouseCheckMore.html?orderName='+data.orderName+'&conType='+conType+'&new=0'+'&tabPageId='+tabPageId+'-10','',tabPageId, reloadPage);
 	}
 	
 	//编辑

adm/src/main/webapp/layui/modules/table.js

@@ -2019,7 +2019,9 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     if(!config) return;
     
     var that = thisTable.that[id];
-    options.where.MINView = "JSON";
+    if(!!options.where) {
+    	options.where.MINView = "JSON";
+    }
     that.reload(options, deep);
     
     return thisTable.call(that);