12/23 单据打印优化，审核订单业务详情优化1.0

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -13,6 +13,7 @@ import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.inout.IoCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.entity.system.*;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
@@ -122,8 +123,10 @@ public class BasicOrderPrintController {
         //根据批次号打印
         if (basicBussinessTypeEntity.getOrderVisibleType() == 0) {
             //查询单据表
+            IoOrderEntity byBillNo = ioOrderService.findByBillNo(filterOrderPrintRequest.getOrderIdFk());
             FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
             filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk());
+            filterOrderRequest.setProductType(byBillNo.getProductType());
             IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
 
 
@@ -151,7 +154,9 @@ public class BasicOrderPrintController {
                     bizData.put("remark2", sysPdfTemplateRelevanceCodeEntity.getRemark2() == null ? ' ' : sysPdfTemplateRelevanceCodeEntity.getRemark2());
                     bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
                     bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName());
-                    bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec());
+                    if (udiProductEntity.getProductsType() == 2){
+                        bizData.put("spec", udiProductEntity.getPrepnSpec() == null ? ' ' : udiProductEntity.getPrepnSpec());
+                    }
                     bizData.put("count", obj.getCount());
                     bizData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname());
                     bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice());

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -194,21 +194,12 @@
     <select id="getCount" resultType="java.lang.Integer">
         select count(*)
         from io_order_detail_biz
-                 left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
-                 left join basic_products bp on bu.uuid = bp.uuid
         <where>
-        <if test="orderIdFk!= null and orderIdFk!= ''">
-            AND orderIdFk = #{orderIdFk}
-        </if>
-        <if test="relId!= null">
-            AND bindRlFk = #{relId}
-        </if>
-        <if test="batchNo!= null and batchNo!= ''">
-            AND batchNo = #{batchNo}
-        </if>
-        <if test="productName!= null and productName!= ''">
-            AND bp.cpmctymc like concat('%', #{productName}, '%')
-        </if>
+            <if test="orderIdFk != null and orderIdFk != ''">
+                AND orderIdFk = #{orderIdFk}
+            </if>
         </where>
     </select>
+
+
 </mapper>