Merge remote-tracking branch 'origin/master'

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

@@ -427,6 +427,7 @@ public class IoOrderReviewController extends BaseController {
     public BaseResponse getReviewOrderSpms(@RequestBody ReviewSpmsRequest reviewSpmsRequest) {
 
         String billNo = reviewSpmsRequest.getBillNo();
+        getUser();
         if (StrUtil.isEmpty(reviewSpmsRequest.getBillNo())) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }

src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java

@@ -105,4 +105,7 @@ public class InvPreinProductResponse {
      */
     private String invCode;
 
+    //计量单位
+    private String measname;
+
 }

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

@@ -29,7 +29,10 @@ public class InnerOrderServiceImpl implements InnerOrderService {
         InnerOrderRequest innerOrderRequest = new InnerOrderRequest();
         innerOrderRequest.setRecordKey(recordKey);
         List<InnerOrderEntity> data = innerOrderDao.queryPageList(innerOrderRequest);
-        return data.get(0);
+        if(data!=null && data.size()>0){
+            return data.get(0);
+        }
+        return new InnerOrderEntity();
     }
 
     @Override

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

@@ -21,7 +21,8 @@
         auth_dept.name      deptName,
         auth_warehouse.name invName,
         ipp.deptCode,
-        ipp.invCode
+        ipp.invCode,
+        bp.measname
         from inv_prein_product ipp
         inner join basic_udirel on ipp.relIdFk = basic_udirel.id
         inner join basic_products bp on basic_udirel.uuid = bp.uuid