Merge branch 'dev' of http://192.168.0.56:3000/bonus/devicesmgt into dev

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java

@@ -274,7 +274,7 @@ public class BackReceiveController extends BaseController {
         }
     }
 
-    @Log(title = "退料接收记录-web", businessType = BusinessType.INSERT)
+    @Log(title = "退料接收记录（数量接收/成套接收）-web", businessType = BusinessType.INSERT)
     @PostMapping("backReceiveRecordWeb")
     public AjaxResult backReceiveRecordWeb(@RequestBody BackApplyInfo record) {
         try {
@@ -286,4 +286,19 @@ public class BackReceiveController extends BaseController {
             throw new RuntimeException(e);
         }
     }
+    @Log(title = "退料接收记录（编码接收）-web", businessType = BusinessType.INSERT)
+    @PostMapping("backReceiveRecordWebPt")
+    public AjaxResult backReceiveRecordWebPt(@RequestBody BackApplyInfo record) {
+        try {
+            List<BackApplyInfo> list = backReceiveService.backReceiveRecordWebPt(record);
+            Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+            Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+            return AjaxResult.success(ListPagingUtil.paging(pageIndex,pageSize, list));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java

@@ -202,4 +202,6 @@ public interface BackReceiveMapper {
     BackApplyInfo backReceiveRecordWeb(BackApplyInfo record);
 
     List<BackApplyInfo> getCtList(BackApplyInfo record);
+
+    List<BackApplyInfo> backReceiveRecordWebPt(BackApplyInfo record);
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java

@@ -97,4 +97,6 @@ public interface BackReceiveService {
     int revoke(BackApplyInfo record);
 
     List<BackApplyInfo> backReceiveRecordWeb(BackApplyInfo record);
+
+    List<BackApplyInfo> backReceiveRecordWebPt(BackApplyInfo record);
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java

@@ -347,6 +347,23 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         return backApplyInfoList;
     }
 
+    @Override
+    public List<BackApplyInfo> backReceiveRecordWebPt(BackApplyInfo record) {
+        String typeId = record.getTypeId();
+        String[] split = typeId.split(",");
+        List<BackApplyInfo> backApplyInfoList = new ArrayList<>();
+        for (String s : split) {
+            record.setTypeId(s);
+            List<BackApplyInfo> backApplyInfo = backReceiveMapper.backReceiveRecordWebPt(record);
+            if (backApplyInfo != null) {
+                for (BackApplyInfo applyInfo : backApplyInfo) {
+                    backApplyInfoList.add(applyInfo);
+                }
+            }
+        }
+        return backApplyInfoList;
+    }
+
     private int insertRad(int taskId, List<BackApplyInfo> wxList) {
         int result = 0;
         if (wxList != null) {

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -966,6 +966,7 @@
     SELECT
     mt2.type_name AS typeName,
     mt1.type_name AS typeCode,
+    ifnull(sum( bcd.back_num ), 0) AS backNum,
     SUM( CASE WHEN bcd.back_status = 1 THEN bcd.back_num ELSE 0 END ) AS hgNum,
     SUM( CASE WHEN bcd.back_status = 2 THEN bcd.back_num ELSE 0 END ) AS wxNum,
     SUM( CASE WHEN bcd.back_status = 3 THEN bcd.back_num ELSE 0 END ) AS bfNum,
@@ -1000,5 +1001,28 @@
     WHERE
       bad.parent_id = #{parentId}
   </select>
+  <select id="backReceiveRecordWebPt" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
+    SELECT
+      mt2.type_name AS typeName,
+      mt1.type_name AS typeCode,
+      ifnull( bcd.back_num, 0 ) AS backNum,
+      mm.ma_code AS maCode,
+      bcd.create_time AS backTime,
+      bcd.type_id AS modelId,
+      bcd.back_status AS backStatus
+    FROM
+      back_check_details bcd
+        LEFT JOIN ma_type mt1 ON mt1.type_id = bcd.type_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
+        LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
+    WHERE
+      bcd.parent_id = #{parentId}
+      AND bcd.type_id = #{typeId}
+    <if test="maCode != null and maCode != ''">
+      and mm.ma_code like concat('%', #{maCode}, '%')
+    </if>
+    ORDER BY
+      bcd.create_time DESC
+  </select>
 
 </mapper>