Merge branch 'dev-1.1.4' into 'dev-1.1.4'

药品入库防止重复提交控制

See merge request lihong/thmz_system!14

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

@@ -224,6 +224,13 @@ public class YpInDetlServiceImpl implements YpInDetlService {
         inDetl.setConfirmFlag("1");
         inDetl.setConfirmId(userId);
         inDetl.setConfirmDate(new Date());
+        YpInDetlVo vo = new YpInDetlVo();
+        BeanUtils.copyProperties(inDetl, vo);
+        vo.setConfirmFlag("0");
+        int num = ypInDetlMapper.selectYpInDetlCount(vo);
+        if(num == 0){
+            throw new MzException("药库入库药品异常，入库单号：" + vo.getInDocuNo() + "没有可入库的药品，请检查! ");
+        }
         ypInDetlMapper.updateYpInDetl(inDetl);
         List<YpInDetl> ypInDetls = ypInDetlMapper.selectYpInDetl(inDetl);
         for (int i = 0; i < ypInDetls.size(); i++) {

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

@@ -177,6 +177,7 @@ $(function () {
         if (ypInDetlVoList[0]['confirmFlag'] === '1') {
             return errorMesageSimaple('当前入库单已审核通过，请勿重复审核！');
         }
+        $("#btn_audit").attr("disabled",true);
         request({
             url: '/auditYpInDetl',
             method: 'GET',
@@ -184,8 +185,12 @@ $(function () {
                 inDocuNo: $("#inDocuNoLabel").val()
             }
         }).then((res) => {
-            initValue();
-            successMesage(res);
+            if(res.code == 0){
+                successMesage(res);
+                initValue();
+            }
+        }).catch((res) => {
+            $("#btn_audit").attr("disabled",false);
         });
     });
     $("#btn_daily").click(function (t) {