退库空指针处理，弹窗限制

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

@@ -75,21 +75,23 @@ public class YpBaseServiceImpl implements YpBaseService {
             YpZdDictVo vo = new YpZdDictVo();
             BeanUtils.copyProperties(yp, vo);
             YpZdDict ypZdDict = ypZdDictMapper.selectYpZdDictByCodeAndSerial(yp.getChargeCode(), yp.getSerial());
-            vo.setPzwh(ypZdDict.getPzwh());
-            vo.setManuCode(ypZdDict.getManuCode());
-            vo.setBuyPrice(ypZdDict.getBuyPrice());
-            vo.setFixPrice(ypZdDict.getFixPrice());
-            vo.setPackRetprice(ypZdDict.getPackRetprice());
-            vo.setRetprice(ypZdDict.getRetprice());
-            vo.setCode(ypZdDict.getCode());
-            vo.setName(ypZdDict.getName());
-            vo.setJbFlag(ypZdDict.getJbFlag());
-            vo.setDelFlag(ypZdDict.getDelFlag());
-            if (StringUtils.isNotBlank(ypZdDict.getManuCode())) {
-                String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());
-                vo.setManufactoryName(manufactoryName);//生产厂家
+            if(null != ypZdDict){
+                vo.setPzwh(StringUtils.isBlank(ypZdDict.getPzwh())?"":ypZdDict.getPzwh());
+                vo.setManuCode(ypZdDict.getManuCode());
+                vo.setBuyPrice(ypZdDict.getBuyPrice());
+                vo.setFixPrice(ypZdDict.getFixPrice());
+                vo.setPackRetprice(ypZdDict.getPackRetprice());
+                vo.setRetprice(ypZdDict.getRetprice());
+                vo.setCode(ypZdDict.getCode());
+                vo.setName(ypZdDict.getName());
+                vo.setJbFlag(ypZdDict.getJbFlag());
+                vo.setDelFlag(ypZdDict.getDelFlag());
+                if (StringUtils.isNotBlank(ypZdDict.getManuCode())) {
+                    String manufactoryName = ypZdManufactoryService.queryYpZdManufactoryByCode(ypZdDict.getManuCode());
+                    vo.setManufactoryName(manufactoryName);//生产厂家
+                }
+                ypZdDictVos.add(vo);
             }
-            ypZdDictVos.add(vo);
         });
         return ypZdDictVos;
     }

src/main/resources/static/js/yk/drug_return.js

@@ -19,6 +19,12 @@ $(function () {
     });
     //新增按钮点击事件
     $("#btn_add").click(function (t) {
+        var data = $('#tb_table').bootstrapTable('getData', true);
+        if (data.length > 0) {
+            if (data[0]['drawNo'].indexOf('T') != -1) {
+                return warningMesageSimaple('当前为历史退库单，请重置后再新增');
+            }
+        }
         $("#editModal").modal();
         $("#classTitle").text("新增");
         resetSearch();
@@ -28,7 +34,7 @@ $(function () {
     $("#btn_save").click(function (t) {
         var data = $('#tb_table').bootstrapTable('getData', true);
         if (data.length > 0) {
-            if(data[0].outAmt < 0){
+            if(data[0]['drawNo'].indexOf('T') != -1){
                 return warningMesageSimaple('当前为历史退库单，请勿重复保存');
             }
             if (!confirm("确定保存该退库单吗？")) {
@@ -88,9 +94,15 @@ $(function () {
         initAddDrugTable();
     });
     $('#btn_delete').on('click', function (e) {
-        var rows = $table.bootstrapTable('getSelections');
+        var data = $('#tb_table').bootstrapTable('getData', true);
+        if (data.length > 0) {
+            if (data[0]['drawNo'].indexOf('T') != -1) {
+                return warningMesageSimaple('当前为历史退库单，如需删除记录，可重置列表');
+            }
+        }
+        var rows = $('#tb_table').bootstrapTable('getSelections');
         for (let i = 0; i < rows.length; i++) {
-            $table.bootstrapTable('remove', {
+            $('#tb_table').bootstrapTable('remove', {
                 field: "id",       //列名
                 values: rows[i].id        //值数组
             });