库存互调新增药品记录处理

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

@@ -114,7 +114,7 @@ public interface YpBaseYfMapper {
      * @return
      */
     @Select({"<script>",
-            "select charge_code,serial,stock_amount,stock_value,group_no,location,visible_flag_mz,visible_flag_zy," +
+            "select charge_code,serial,stock_amount,stock_value,group_no,location,visible_flag_mz,visible_flag_zy,max_stock,mini_stock,isnull(split_percent,0)split_percent,retprice,pack_retprice," +
                     "       visible_flag_stop,stock_amount_virtual,stock_amount_virtual2,(case when open_virtual2='' then 0 else isnull(open_virtual2,0) end) as open_virtual2 " +
                     "from yp_base_yf WITH(NOLOCK) where charge_code=#{chargeCode} and serial=#{serial} and group_no=#{groupNo} ",
             "<when test='visibleFlagMz!=null'>",

src/main/java/cn/hnthyy/thmz/service/impl/his/yf/YpOutDetlYfServiceImpl.java

@@ -162,6 +162,8 @@ public class YpOutDetlYfServiceImpl implements YpOutDetlYfService {
                     ypBase.setVisibleFlagZy("0");
                     ypBase.setStockAmount(outAmt);
                     ypBase.setStockValue(multiply);
+                    ypBase.setStockAmountVirtual(outAmt);
+                    ypBase.setGroupNo(ypOutDetlYf.getGroupNoOut());
                     ypBaseYfMapper.insertYpBaseYf(ypBase);
                 }else{
                     ypBaseYfMapper.updateStockAmount(chargeCode,serial,ypOutDetlYf.getGroupNoOut(),outAmt, multiply);

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

@@ -58,7 +58,7 @@ $(function () {
     $('#reportrange span').html(moment().subtract(29, 'days').format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
     $(".selectpicker").selectpicker();
     if (groupNo == null) {
-        return errorMesageSimaple('药库参数未设置，请在药品管理参数设置中设置');
+        return errorMesageSimaple('药房参数未设置，请在药品管理参数设置中设置');
     }
     $("input").each(function () {
         this.onkeydown = function (e) { // 监听键盘事件