Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -1067,7 +1067,7 @@ public class IoCodeTempController extends BaseController {
 
             codeTempEntity.setRelId(codeSaveRequest.getRelId());
             int reCount = udiCalCountUtil.getActCount(codeTempEntity);
-            codeTempEntity.setReCount(reCount);
+//            codeTempEntity.setReCount(reCount);
         }
         IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -80,6 +80,7 @@ public class IoCheckInoutService {
 
     /**
      * 判断是否需要手动校验
+     *
      * @param billNo
      * @return
      */
@@ -132,6 +133,7 @@ public class IoCheckInoutService {
 
     /**
      * 校验流程  | 一次校验
+     *
      * @param orderId
      */
     public void check(String orderId) {
@@ -782,7 +784,8 @@ public class IoCheckInoutService {
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
             orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
             orderEntity.setUpdateTime(new Date());
-            orderEntity.setCheckTime(new Date());
+            if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
+                orderEntity.setCheckTime(new Date());
             orderService.update(orderEntity);
             checkSecond(orderEntity);
         }
@@ -839,7 +842,8 @@ public class IoCheckInoutService {
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
             orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
             orderEntity.setUpdateTime(new Date());
-            orderEntity.setAuditTime(new Date());
+            if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
+                orderEntity.setAuditTime(new Date());
             if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
                 orderEntity.setReviewUser(orderEntity.getReviewUser());
             }

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -112,9 +112,15 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
             filterUdiRelRequest.setId(Long.valueOf(obj.getProductId()));
             filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode()));
             System.out.println(filterUdiRelRequest.getPackLevel());
+            int a=0;
+            if (filterUdiRelRequest.getPackLevel()==null){
+                a=0;
+            }else {
+                a=Integer.parseInt(filterUdiRelRequest.getPackLevel())-1;
+            }
             //查询耗材字典信息
-            //            UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
-            UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1);
+            //UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
+            UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a);
             //查询产品信息
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
 

src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml

@@ -17,6 +17,7 @@
                 '%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d')
             </if>
         </where>
+        ORDER BY inv_inner_order.createTime DESC
     </select>
 
     <insert id="insert" keyProperty="id"