Merge branch 'dev_fifo' into lh_dev_fifo

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -456,8 +456,7 @@ public class PurApplyController {
     public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
+        PageInfo<PurOrderDetailResponse> pageInfo  = new PageInfo<>(purApplyDetailEntities);
-        pageInfo = new PageInfo<>(purApplyDetailEntities);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
@@ -475,7 +474,10 @@ public class PurApplyController {
     public BaseResponse getDetailList(PurApplyDetailRequest purApplyDetailRequest) {
         List<PurOrderDetailResponse> list = purApplyDetailService.getDetailList(purApplyDetailRequest);
         PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(list);
-        return ResultVOUtils.page(pageInfo);
+        PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     /**

src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java

@@ -22,9 +22,9 @@ public class DeviceRepairApplyDetailDiagnosisParam {
     @NotBlank(message = "诊断信息不能为空")
     String diagnosisInfo;
 
-    String diagnosisLivePath;
+    String diagnosisLivePath;//现场图片路径
 
-    Boolean innerFlag;
+    Boolean innerFlag;//是否需要维修
 
     Long repairUserId;
 

src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java

@@ -85,7 +85,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
                 .set(DeviceRepairEntity::getServiceLivePath, deviceRepairEntity.getServiceLivePath())
                 .set(DeviceRepairEntity::getUpdateTime,LocalDateTime.now())
                 .eq(DeviceRepairEntity::getId, repairId)
-                .eq(DeviceRepairEntity::getCreateUserId, user.getId())
+//                .eq(DeviceRepairEntity::getCreateUserId, user.getId())
                 .eq(DeviceRepairEntity::getFinishFlag, false)
         );
         if (updated && entity.getApplyId() != null) {

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

@@ -117,7 +117,7 @@
             </if>
         </where>
         GROUP BY ip.relIdFk, ip.batchNo, ip.supId, ip.price
-        order by ip.updateTime desc
+        order by bp.cpmctymc,ip.updateTime desc
     </select>
 
     <select id="stockStatistics" resultType="com.glxp.api.res.inv.InvProductResponse">

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

@@ -84,7 +84,7 @@
             </if>
         </where>
         GROUP BY ipp.relId, ipp.batchNo
-        order by ipp.updateTime desc
+        order by bp.cpmctymc,ipp.updateTime desc
     </select>
 
     <select id="filterInvProductDetailList" resultType="com.glxp.api.entity.inv.InvProductDetailEntity"

src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -118,7 +118,15 @@
     </insert>
 
     <select id="selectPurApplyDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
-        SELECT pur_apply_detail.*,
+        SELECT
+        pur_apply_detail.id,
+        pur_apply_detail.orderIdFk,
+        pur_apply_detail.productId,
+        pur_apply_detail.productName,
+        pur_apply_detail.count,
+        pur_apply_detail.supId,
+        pur_apply_detail.zczbhhzbapzbh,
+        pur_apply_detail.destinyId,
                pur_apply.billNo,
                basic_products.ggxh spec,
                basic_products.nameCode,