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

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

@@ -34,13 +34,13 @@ public class LeaseOutDetailsController extends BaseController {
 
     /**
      * 根据code编码查询设备信息
-     * @param mCode 机具编码
+     * @param maCode 机具编码
      * @return 设备信息
      */
     @Log(title = "根据code编码获取设备信息", businessType = BusinessType.QUERY)
     @GetMapping("/getMaMachineByCode")
-    public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String mCode) {
+    public TableDataInfo getMaMachineByCode(@RequestParam(value = "maCode") String maCode) {
-        return getDataTable(leaseOutDetailsService.getMaMachineByCode(mCode));
+        return getDataTable(leaseOutDetailsService.getMaMachineByCode(maCode));
     }
 
     /**

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java

@@ -1,5 +1,6 @@
 package com.bonus.sgzb.app.domain;
 
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 /**
@@ -86,8 +87,46 @@ public class BackApplyInfo {
     private String lotId;
     private String unitId;
     private String backTime;
+    private Integer maId;
     /**
      * 机具管理方式
      */
     private String manageType;
+    /**
+     * 合格数量
+     */
+    private Integer passNum;
+    /**
+     * 维修数量
+     */
+    private Integer maintenanceNum;
+    /**
+     * 报废数量
+     */
+    private Integer scrapNum;
+
+    /**
+     * 退料数量
+     */
+    private Integer backNum;
+
+    /**
+     * 退料数量
+     */
+    private String backStatus;
+
+    /**
+     * 合格入库数量
+     */
+    private String inputNum;
+
+    /**
+     * 任务类型
+     */
+    private Integer taskType;
+
+    /**
+     * 任务id
+     */
+    private Integer taskId;
 }

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

@@ -83,8 +83,8 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
     }
 
     /**
-     * @param maMachine
+     * @param maCode 编码ID
-     * @return
+     * @return 数据
      */
     @Override
     public List<MaMachine> getMaMachineByCode(String maCode) {

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml

@@ -87,10 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ma_type mt1 on mt.parent_id = mt1.type_id
         left join ma_type mt2 on mt1.parent_id = mt2.type_id
         left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
-        <where>
+        where m.ma_code = #{maCode}
-            m.ma_code = #{maCode}
-        </where>
-        order by m.ma_id desc
     </select>
 
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackApplyController.java

@@ -52,7 +52,7 @@ public class BackApplyController extends BaseController {
      */
     @ApiOperation(value = "获取在用物料列表")
     @GetMapping("/getMaterialList")
-    public TableDataInfo getMaterialList(@RequestBody BackApplyInfo bean)
+    public TableDataInfo getMaterialList(BackApplyInfo bean)
     {
         startPage();
         List<BackApplyInfo> list = backApplyService.getMaterialList(bean);
@@ -64,7 +64,7 @@ public class BackApplyController extends BaseController {
      */
     @ApiOperation(value = "退料申请详情")
     @GetMapping("/getView")
-    public TableDataInfo getView(@RequestBody BackApplyInfo bean)
+    public TableDataInfo getView(BackApplyInfo bean)
     {
         startPage();
         List<BackApplyInfo> list = backApplyService.getView(bean);
@@ -86,7 +86,7 @@ public class BackApplyController extends BaseController {
      */
     @ApiOperation(value = "退料申请删除")
     @GetMapping("/del")
-    public AjaxResult del(@RequestBody BackApplyInfo bean)
+    public AjaxResult del(BackApplyInfo bean)
     {
         return backApplyService.del(bean);
     }