退料接收后台代码提交

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

@@ -53,7 +53,7 @@ public class BackReceiveController extends BaseController {
      * @param record 查询条件
      * @return AjaxResult对象
      */
-    @Log(title = "退料接收明细", businessType = BusinessType.QUERY)
+    @Log(title = "退料接收明细-app", businessType = BusinessType.QUERY)
     @PostMapping("receiveView")
     public AjaxResult receiveView(@RequestBody BackApplyInfo record) {
         try {
@@ -64,6 +64,23 @@ public class BackReceiveController extends BaseController {
         }
     }
 
+    /**
+     * 退料接收明细
+     *
+     * @param record 查询条件
+     * @return AjaxResult对象
+     */
+    @Log(title = "退料接收明细-web", businessType = BusinessType.QUERY)
+    @PostMapping("receiveViewWeb")
+    public AjaxResult receiveViewWeb(@RequestBody BackApplyInfo record) {
+        try {
+            startPage();
+            List<BackApplyInfo> list = backReceiveService.receiveView(record);
+            return success(getDataTable(list));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 
     /**
      * 数量退料--管理方式为1的

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

@@ -47,6 +47,7 @@ public class BackApplyInfo {
      * 规格id
      */
     private String typeId;
+    private String modelId;
     /**
      * 类型名称
      */

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

@@ -653,7 +653,8 @@
       bai.id,
       bai.task_id as taskId,
       tta.agreement_id as agreementId,
-      mt.type_id as typeId,
+      mt.type_id as modelId,
+      mt2.type_id as typeId,
       mt.type_name as typeCode,
       mt.unit_name as unitName,
       mt2.type_name AS typeName,
@@ -665,8 +666,7 @@
         LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
         LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
         LEFT JOIN ma_type mt on mt.type_id=bad.type_id
-        LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
-        LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
+        LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id
         LEFT JOIN (
         SELECT
           type_id as typeId,
@@ -679,8 +679,11 @@
       ) aa on aa.typeId=bad.type_id
     WHERE
       bai.id=#{id}
-      <if test="code != null and code != ''">
-        and CONCAT('NSJJ',mt.`code`,mt.model_code) like concat ('%',#{code},'%')
+      <if test="typeId != null and typeId != ''">
+        and mt2.type_id = #{typeId}
+      </if>
+      <if test="modelId != null and modelId != ''">
+        and mt.type_id = #{modelId}
       </if>
   </select>