杰生

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockBackMapper.java

@@ -72,7 +72,8 @@ public interface StockBackMapper extends BaseMapper<StockBack> {
     Page<StatisticsResult> selectPickingPage(@Param("page") Page<StockBack> page,
                                              @Param("jobNo") String jobNo,
                                              @Param("beginTime") Date beginTime,
-                                             @Param("endTime") Date endTime);
+                                             @Param("endTime") Date endTime,
+                                             @Param("tech") String tech);
 
     @TenantIgnore
     Map<String, Object> getBackStatistics(@Param("ew") QueryWrapper<Object> wrapper);

hx-service/storage/src/main/java/com/fjhx/stock/mapper/StockBackMapper.xml

@@ -202,6 +202,9 @@
                 uu.departmentID in ('A007', 'A008', 'A012')
             </otherwise>
         </choose>
+        <if test="tech neq null or tech neq ''">
+            and sbpd.tech = #{tech}
+        </if>
         group by uu.JobNo,sbpd.plan_material
     </select>
 

hx-service/storage/src/main/java/com/fjhx/stock/service/impl/StockBackServiceImpl.java

@@ -434,7 +434,9 @@ public class StockBackServiceImpl extends ServiceImpl<StockBackMapper, StockBack
         Assert.notEmpty(endTimeStr, "结束时间不能为空");
         Date endTime = DateUtil.endOfDay(DateUtil.parse(endTimeStr));
 
-        return baseMapper.selectPickingPage(createPage(condition), jobNo, beginTime, endTime);
+        String tech = condition.get("tech");
+
+        return baseMapper.selectPickingPage(createPage(condition), jobNo, beginTime, endTime, tech);
     }
 
     @Override