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

退库单打印调整

See merge request hurugang/thmz_system!15

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

@@ -171,7 +171,7 @@ public interface YpOutDetlMapper {
      * @return
      */
     @Select("<script>" +
-            "select dept_code,input_id,confirm_flag,confirm_id,confirm_date,out_date,draw_no,draw_yf,in_draw_no,\n" +
+            "select dept_code,input_id,confirm_flag,confirm_id,confirm_date,out_date,manu_no,draw_no,draw_yf,in_draw_no,\n" +
             "  drawer,serial,out_amt,pack_retprice,fix_price,acct_sign,buy_price,rtrim(charge_code)charge_code,group_no_out,\n" +
             "  group_no,accept_sign,keeper" +
             " from yp_out_detl WITH(NOLOCK)" +
@@ -186,7 +186,7 @@ public interface YpOutDetlMapper {
             "        AND out_seri = #{outSeri}" +
             "   </if>" +
             "</where>" +
-            " group by dept_code,input_id,confirm_flag,confirm_id,confirm_date,out_date,draw_no,draw_yf," +
+            " group by dept_code,input_id,confirm_flag,confirm_id,confirm_date,out_date,manu_no,draw_no,draw_yf," +
             "   drawer,serial,pack_retprice,fix_price,acct_sign,buy_price,charge_code,group_no_out,group_no,accept_sign,keeper,in_draw_no,out_amt"+
             "</script>")
     List<YpOutDetlVo> selectDrugTkRecord(YpOutDetl ypOutDetl);

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

@@ -104,6 +104,7 @@ public class YpOutDetlServiceImpl implements YpOutDetlService {
             ypOutDetlVo.setBuyPrice(ypZdDict.getBuyPrice());
             ypOutDetlVo.setSpecification(ypZdDict.getSpecification());
             ypOutDetlVo.setJbFlag(ypZdDict.getJbFlag());
+            ypOutDetlVo.setLocation(ypZdDict.getLocation());
             ypOutDetlVo.setManufactoryName(ypZdManufactoryMapper.selectYpZdManufactoryByCode(ypZdDict.getManuCode()));
             //查询出库记录，给出库总数量赋值
             ypOutDetlVo.setNewOutAmt(ypOutDetlVo.getOutAmt());

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

@@ -626,6 +626,7 @@ function getDetail(drawNo) {
 
 function initPrintHtml(){
     var datas = $('#tb_table').bootstrapTable('getData', true);
+    console.log(datas)
     let html = '';
     let packRetpriceSum = 0;
     let buyPriceSum = 0;
@@ -655,9 +656,9 @@ function initPrintHtml(){
         html += '<td class="xtd" style="text-align: center;">' + data['packRetprice'] + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + buyPrice + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + packRetprice + '</td>';
-        html += '<td class="xtd" style="text-align: center;">' + (isEmpty(data['manuNo'])?'':isEmpty(data['manuNo'])) + '</td>';
-        html += '<td class="xtd" style="text-align: left;">' + (isEmpty(data['manufactoryName'])?'':data['manufactoryName']) + '</td>';
-        html += '<td class="xtd" style="text-align: center;">' + format(data['effDate'], "yyyy-MM-dd") + '</td>';
+        html += '<td class="xtd" style="text-align: center;">' + (isEmpty(data['manuNo'])?'':data['manuNo']) + '</td>';
+//        html += '<td class="xtd" style="text-align: left;">' + (isEmpty(data['manufactoryName'])?'':data['manufactoryName']) + '</td>';
+//        html += '<td class="xtd" style="text-align: center;">' + format(data['effDate'], "yyyy-MM-dd") + '</td>';
         html += '<td class="xtd" style="text-align: center;">' + (isEmpty(data['stockAmount'])?'':data['stockAmount']) + '</td>';
         html += '</tr>';
     }
@@ -673,8 +674,8 @@ function initPrintHtml(){
 function print() {
     setDefaultPrint();
     LODOP = getLodop();
-    LODOP.PRINT_INITA(6, 0, "210mm", "297mm", "长沙泰和医院退库单");
-    LODOP.SET_PRINT_PAGESIZE(2, 0, 0, "A4");
+    LODOP.PRINT_INITA(6, 0, "215mm", "280mm", "长沙泰和医院退库单");
+    LODOP.SET_PRINT_PAGESIZE(1, "215mm", "280mm", "");
     //设置默认打印机
     LODOP.SET_PRINTER_INDEX(defaultPrintIndex);
     LODOP.ADD_PRINT_TEXT('190mm', '140mm', '40mm', '40mm', '第#页/共&页');

src/main/resources/templates/yk/drug_return.html

@@ -51,29 +51,29 @@
                                     class="groupName"></span></td>
                             <td colspan="3" style="text-align: left;border: transparent !important;">出库单号：<span
                                     class="drawNo"></span></td>
-                            <td colspan="4" style="text-align: left;border: transparent !important;">请领日期：<span
+                            <td colspan="3" style="text-align: left;border: transparent !important;">请领日期：<span
                                     class="planDate"></span></td>
-                            <td colspan="3" style="text-align: left;border: transparent !important;">审核日期：<span
+                            <td colspan="2" style="text-align: left;border: transparent !important;">审核日期：<span
                                     class="confirmDate"></span></td>
                         </tr>
                         <tr id="base_tr">
-                            <td class="xtd" style="text-align: center;width: 60px;">编码</td>
+                            <td class="xtd" style="text-align: center;width: 80px;">编码</td>
                             <td class="xtd" style="text-align: center;width: 80px;">货位号</td>
                             <td class="xtd" style="text-align: center;width: 140px;">药品名称</td>
                             <td class="xtd" style="text-align: center;width: 100px;">规格</td>
-                            <td class="xtd" style="text-align: center;width: 40px;">数量</td>
-                            <td class="xtd" style="text-align: center;width: 60px;">购入价</td>
-                            <td class="xtd" style="text-align: center;width: 60px;">零售价</td>
-                            <td class="xtd" style="text-align: center;width: 60px;">购入金额</td>
-                            <td class="xtd" style="text-align: center;width: 60px;">零售金额</td>
-                            <td class="xtd" style="text-align: center;width: 80px;">生产批号</td>
-                            <td class="xtd" style="text-align: center;width: 100px;">生产厂家</td>
-                            <td class="xtd" style="text-align: center;width: 100px;">有效期</td>
-                            <td class="xtd" style="text-align: center;width: 60px;">库存</td>
+                            <td class="xtd" style="text-align: center;width: 80px;">数量</td>
+                            <td class="xtd" style="text-align: center;width: 80px;">购入价</td>
+                            <td class="xtd" style="text-align: center;width: 80px;">零售价</td>
+                            <td class="xtd" style="text-align: center;width: 100px;">购入金额</td>
+                            <td class="xtd" style="text-align: center;width: 100px;">零售金额</td>
+                            <td class="xtd" style="text-align: center;width: 120px;">生产批号</td>
+<!--                            <td class="xtd" style="text-align: center;width: 100px;">生产厂家</td>-->
+<!--                            <td class="xtd" style="text-align: center;width: 100px;">有效期</td>-->
+                            <td class="xtd" style="text-align: center;width: 120px;">库存</td>
                         </tr>
                         <tr style="border: transparent !important;"></tr>
                         <tr>
-                            <td colspan="4" class="xtd"
+                            <td colspan="3" class="xtd"
                                 style="text-align: right;border: transparent !important;font-weight: bold;">合计：
                             </td>
                             <td colspan="3" class="xtd"
@@ -82,7 +82,7 @@
                             <td colspan="3" class="xtd"
                                 style="text-align: left;border: transparent !important;font-weight: bold;">购入总额：<span
                                     class="buyPriceSum"></span></td>
-                            <td colspan="3" class="xtd" style="text-align: center;border: transparent !important;">打印日期：<span
+                            <td colspan="4" class="xtd" style="text-align: center;border: transparent !important;">打印日期：<span
                                     class="printDate"></span></td>
                         </tr>
                         <tr style="border: transparent !important;"></tr>
@@ -92,7 +92,7 @@
                             </td>
                             <td colspan="1" class="xtd" style="text-align: left;border: transparent !important;">发药人：
                             </td>
-                            <td colspan="3" class="xtd" style="text-align: left;border: transparent !important;">
+                            <td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">
                                 发药复核人：
                             </td>
                             <td colspan="2" class="xtd" style="text-align: left;border: transparent !important;">领药人：