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>

sgzb-ui/src/api/claimAndRefund/return.js

@@ -174,7 +174,13 @@ export function backReceiveRecordWeb(data) {
     data: data
   })
 }
-
+export function backReceiveRecordWebPt(data) {
+  return request({
+    url: 'base/backReceive/backReceiveRecordWebPt ',
+    method: 'post',
+    data: data
+  })
+}
 
 // 退料接收 数量接收
 export function setNumBack(data) {

sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue

@@ -196,63 +196,7 @@
 
     <!-- 数量退料弹窗 -->
     <el-dialog :title="title" :visible.sync="openNum" width="1200px" append-to-body>
-      <div v-if="dialogData.typeMange == 1">
-        <div style="margin-left: 40px; margin-bottom: 10px">退料数量：{{ returnNum }}</div>
-        <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
-          <el-col :span="1.5">
-            <el-button type="primary" size="mini" v-if="returnNum > 0" @click="saveNumReturn(dialogData.typeMange)">
-              保存
-            </el-button>
-          </el-col>
-        </el-row>
-        <el-table v-loading="loading" :data="numList" height="500">
-          <el-table-column label="序号" align="center" type="index" />
-          <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
-          <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
-          <el-table-column label="退料数量" align="center" prop="backNum" :show-overflow-tooltip="true" />
-          <el-table-column label="合格数量" align="center" prop="qualifiedNum" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.qualifiedNum"
-                placeholder="请输入合格数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="待维修数量" align="center" prop="serviceNum" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.serviceNum"
-                placeholder="请输入待维修数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="待报废数量" align="center" prop="scrapNum">
-            <template slot-scope="scope">
-              <el-input
-                v-model.number="scope.row.scrapNum"
-                placeholder="请输入待报废数量"
-                type="number"
-                :min="0"
-                clearable
-                :disabled="dialogIsView"
-                style="width: 100%"
-              />
-            </template>
-          </el-table-column>
-          <!-- <el-table-column label="报废信息" align="center" prop="" :show-overflow-tooltip="true" /> -->
-        </el-table>
-      </div>
-      <div v-else>
+      <div v-if="dialogData.typeMange == 2">
         <div style="margin-bottom: 30px">
           接收抱杆类型：{{ dialogData.typeName }}，型号：{{ dialogData.typeCode }}，付数：{{ returnNum }}。接收明细如下
         </div>
@@ -311,6 +255,63 @@
           </el-table-column>
         </el-table>
       </div>
+
+      <div v-else>
+        <div style="margin-left: 40px; margin-bottom: 10px">退料数量：{{ returnNum }}</div>
+        <el-row :gutter="10" class="mb8" v-if="!dialogIsView">
+          <el-col :span="1.5">
+            <el-button type="primary" size="mini" v-if="returnNum > 0" @click="saveNumReturn(dialogData.typeMange)">
+              保存
+            </el-button>
+          </el-col>
+        </el-row>
+        <el-table v-loading="loading" :data="numList" height="500">
+          <el-table-column label="序号" align="center" type="index" />
+          <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
+          <el-table-column label="规格型号" align="center" prop="typeCode" :show-overflow-tooltip="true" />
+          <el-table-column label="退料数量" align="center" prop="backNum" :show-overflow-tooltip="true" />
+          <el-table-column label="合格数量" align="center" prop="qualifiedNum" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.qualifiedNum"
+                placeholder="请输入合格数量"
+                type="number"
+                :min="0"
+                clearable
+                :disabled="dialogIsView"
+                style="width: 100%"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="待维修数量" align="center" prop="serviceNum" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.serviceNum"
+                placeholder="请输入待维修数量"
+                type="number"
+                :min="0"
+                clearable
+                :disabled="dialogIsView"
+                style="width: 100%"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="待报废数量" align="center" prop="scrapNum">
+            <template slot-scope="scope">
+              <el-input
+                v-model.number="scope.row.scrapNum"
+                placeholder="请输入待报废数量"
+                type="number"
+                :min="0"
+                clearable
+                :disabled="dialogIsView"
+                style="width: 100%"
+              />
+            </template>
+          </el-table-column>
+          <!-- <el-table-column label="报废信息" align="center" prop="" :show-overflow-tooltip="true" /> -->
+        </el-table>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -320,6 +321,7 @@ import {
   receiveView,
   getBackMachine,
   backReceiveRecordWeb,
+  backReceiveRecordWebPt,
   setNumBack,
   setCodeBack,
   getRecord,
@@ -517,7 +519,7 @@ export default {
         }
         backReceiveRecordWeb(param).then(res => {
           if (res.code == 200) {
-            this.title = '查看'
+            this.title = '查看1'
             this.openNum = true
             this.dialogIsView = true
             this.numList = res.data.rows
@@ -544,7 +546,7 @@ export default {
           }
         })
       } else if (row.manageType == '0') {
-        this.title = '查看'
+        this.title = '查看0'
         this.openCode = true
         this.resetForm('codeQuery')
         this.codeQuery.parentId = row.id
@@ -665,9 +667,9 @@ export default {
     },
     //获取退料编码查看列表
     getCodeViewList() {
-      backReceiveRecordWeb(this.codeQuery).then(response => {
+      backReceiveRecordWebPt(this.codeQuery).then(response => {
         this.codeList = response.data.rows
-        this.codeList
+        // this.codeList
         this.codeList.forEach(item => {
           item.typeModelName = item.typeCode
           if (item.backStatus == '1') {