入库取消分页，增加药房判断

src/main/java/cn/hnthyy/thmz/controller/yf/YfWarehouseController.java

@@ -98,7 +98,7 @@ public class YfWarehouseController {
      */
     @UserLoginToken
     @RequestMapping(value = "/getYpOutDetlDetail",method = {RequestMethod.GET})
-    public Map<String,Object> getYpOutDetlDetail(@RequestParam("drawNo") String drawNo){
+    public Map<String,Object> getYpOutDetlDetail(@RequestParam("drawNo") String drawNo,@RequestParam("groupNo") String groupNo){
         Map<String, Object> resultMap = new HashMap<>();
         try {
             if (StringUtils.isBlank(drawNo)) {
@@ -106,7 +106,7 @@ public class YfWarehouseController {
                 resultMap.put("message", "查询入库单详细失败，单号为空");
                 return resultMap;
             }
-            List<YpOutDetlVo> list = ypOutDetlService.queryYpOutDetlDetail(drawNo);
+            List<YpOutDetlVo> list = ypOutDetlService.queryYpOutDetlDetail(drawNo,groupNo);
             list.forEach(y ->{
                 YpZdDict ypZdDict = ypZdDictService.queryYpZdDictByCodeAndSerial(y.getChargeCode(), y.getSerial());
                 y.setName(ypZdDict.getName());

src/main/java/cn/hnthyy/thmz/mapper/his/yp/YpOutDetlMapper.java

@@ -95,10 +95,10 @@ public interface YpOutDetlMapper {
             "       drawer,serial,out_amt,out_seri,pack_retprice," +
             "       fix_price,acct_sign,buy_price,charge_code,group_no_out,group_no,in_draw_no,in_seri,accept_sign" +
             " from yp_out_detl WITH(NOLOCK)" +
-            " where draw_no = #{drawNo} " +
+            " where draw_no = #{drawNo} and group_no_out=#{groupNo}" +
             " ORDER BY out_seri ASC" +
             "</script>")
-    List<YpOutDetlVo> selectYpOutDetlDetail(String drawNo);
+    List<YpOutDetlVo> selectYpOutDetlDetail(String drawNo,String groupNo);
 
     /**
      * 更新药房入库状态

src/main/java/cn/hnthyy/thmz/service/his/yp/YpOutDetlService.java

@@ -24,8 +24,9 @@ public interface YpOutDetlService {
     /**
      * 查询药库出库单详细
      * @param drawNo
+     * @param groupNo 药房编码
      * @return
      */
-    List<YpOutDetlVo> queryYpOutDetlDetail(String drawNo);
+    List<YpOutDetlVo> queryYpOutDetlDetail(String drawNo, String groupNo);
 
 }

src/main/java/cn/hnthyy/thmz/service/impl/his/yp/YpOutDetlServiceImpl.java

@@ -31,7 +31,7 @@ public class YpOutDetlServiceImpl implements YpOutDetlService {
     }
 
     @Override
-    public List<YpOutDetlVo> queryYpOutDetlDetail(String drawNo) {
-        return ypOutDetlMapper.selectYpOutDetlDetail(drawNo);
+    public List<YpOutDetlVo> queryYpOutDetlDetail(String drawNo, String groupNo) {
+        return ypOutDetlMapper.selectYpOutDetlDetail(drawNo,groupNo);
     }
 }

src/main/resources/static/js/yf/pharmacy_warehouse.js

@@ -37,10 +37,10 @@ function initDrugTable(drawNo) {
         toolbar: '#toolbar',                //工具按钮用哪个容器
         striped: true,                      //是否显示行间隔色
         cache: true,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
-        pagination: true,                   //是否显示分页（*）
+        pagination: false,                   //是否显示分页（*）
         sortable: true,                     //是否启用排序
         sortOrder: "asc",                   //排序方式
-        queryParams:{'drawNo':drawNo},           //传递参数（*）
+        queryParams:{'drawNo':drawNo,groupNo:pharmacyGroupNo},           //传递参数（*）
         sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
         pageNumber: 1,                       //初始化加载第一页，默认第一页
         pageSize: 10,                       //每页的记录行数（*）