功能完善

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

@@ -139,6 +139,17 @@ public class BackReceiveController extends BaseController {
         }
     }
 
+    @Log(title = "退料接收-rfid编码查询", businessType = BusinessType.INSERT)
+    @PostMapping("rfidCodeQuery")
+    public AjaxResult rfidCodeQuery(@RequestBody BackApplyInfo record) {
+        try {
+            List<BackApplyInfo> list =backReceiveService.rfidCodeQuery(record);
+            return AjaxResult.success(list);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Log(title = "退料接收记录", businessType = BusinessType.INSERT)
     @PostMapping("backReceiveRecord")
     public AjaxResult backReceiveRecord(@RequestBody BackApplyInfo record) {

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

@@ -143,7 +143,14 @@ public class BackApplyInfo {
     private List<BackApplyInfo> backApplyDetails;
     private Integer parentId;
     private String sdStatus;
+    /**
+     * 二维码编码
+     */
     private String qrCode;
+    /**
+     * rfid编码
+     */
+    private String rfidCode;
     private String repairedNum;
     private String backId;
     private String repairer;

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

@@ -57,4 +57,11 @@ public interface BackReceiveMapper {
     List<BackApplyInfo> backReceiveRecord(BackApplyInfo record);
 
     int selectCodeByMaIdAndTaskId(@Param("maId") Integer maId,@Param("taskId") Integer taskId);
+
+    /**
+     * 退料接收-rfid编码查询
+     * @param record
+     * @return List<BackApplyInfo>
+     */
+    List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record);
 }

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

@@ -21,4 +21,11 @@ public interface BackReceiveService {
     List<BackApplyInfo> qrcodeQuery(BackApplyInfo record);
 
     List<BackApplyInfo> backReceiveRecord(BackApplyInfo record);
+
+    /**
+    * 退料接收-rfid编码查询
+    * @param record
+    * @return List<BackApplyInfo>
+    */
+    List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record);
 }

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

@@ -169,6 +169,11 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         return backReceiveMapper.backReceiveRecord(record);
     }
 
+    @Override
+    public List<BackApplyInfo> rfidCodeQuery(BackApplyInfo record) {
+        return backReceiveMapper.rfidCodeQuery(record);
+    }
+
     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

@@ -749,5 +749,22 @@
       AND bai.task_id = #{taskId}
   </select>
 
+  <select id="rfidCodeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
+    SELECT
+      mt.type_id as typeId,
+      mm.ma_id as maId,
+      mm.ma_code as maCode,
+      mt.type_name as typeCode,
+      mt2.type_name as typeName,
+      sd.`name` as sdStatus
+    FROM
+      ma_machine mm
+        LEFT JOIN ma_type mt on mt.type_id=mm.type_id
+        LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
+        LEFT JOIN sys_dic sd on mm.ma_status=sd.id
+    WHERE
+      rfid_code =#{rfidCode}
+  </select>
+
 
 </mapper>

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java

@@ -163,6 +163,11 @@ public class PurchasePartDetails extends BaseEntity
     @ApiModelProperty(value = "关键字筛选")
     private String keyWord;
 
+    /**
+     * 提交入库时间
+     */
+    private String submitStorageTime;
+
     public void setTaskId(Long taskId)
     {
         this.taskId = taskId;
@@ -447,6 +452,14 @@ public class PurchasePartDetails extends BaseEntity
         this.createTime = createTime;
     }
 
+    public String getSubmitStorageTime() {
+        return submitStorageTime;
+    }
+
+    public void setSubmitStorageTime(String submitStorageTime) {
+        this.submitStorageTime = submitStorageTime;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)