Browse Source

0412更新

master
ruanqi 2 years ago
parent
commit
eb13609588
  1. 2
      src/main/java/com/heai/modules/production/controller/DailyPlanController.java
  2. 2
      src/main/java/com/heai/modules/production/service/DailyPlanService.java
  3. 4
      src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
  4. 8
      src/main/resources/mapper/production/SoScheduledListMapper.xml

2
src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@ -55,7 +55,7 @@ public class DailyPlanController {
*/ */
@PostMapping("/getSchedulingSize") @PostMapping("/getSchedulingSize")
public R getSchedulingSize(@RequestBody DailyPlanInData dailyPlanInData){ public R getSchedulingSize(@RequestBody DailyPlanInData dailyPlanInData){
double schedulingSize=dailyPlanService.getSchedulingSize(dailyPlanInData.getOrderNo());
double schedulingSize=dailyPlanService.getSchedulingSize(dailyPlanInData);
return R.ok().put("schedulingSize",schedulingSize); return R.ok().put("schedulingSize",schedulingSize);
} }
/** /**

2
src/main/java/com/heai/modules/production/service/DailyPlanService.java

@ -32,7 +32,7 @@ public interface DailyPlanService {
* @return double * @return double
* @throw * @throw
*/ */
double getSchedulingSize(String orderNo);
double getSchedulingSize(DailyPlanInData dailyPlanInData);
/** /**
* @Description 保存日计划 * @Description 保存日计划
* @Title savePlan * @Title savePlan

4
src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@ -52,9 +52,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
} }
@Override @Override
public double getSchedulingSize(String orderNo){
DailyPlanInData dailyPlanInData=new DailyPlanInData();
dailyPlanInData.setOrderNo(orderNo);
public double getSchedulingSize(DailyPlanInData dailyPlanInData){
List<SoScheduledListData> list =soScheduledListMapper.getSoscheduledListData(dailyPlanInData); List<SoScheduledListData> list =soScheduledListMapper.getSoscheduledListData(dailyPlanInData);
if(list.size()>0) { if(list.size()>0) {
return soScheduledListMapper.getSchedulingSize(dailyPlanInData); return soScheduledListMapper.getSchedulingSize(dailyPlanInData);

8
src/main/resources/mapper/production/SoScheduledListMapper.xml

@ -5,10 +5,10 @@
select round(isnull(scheduling_size,0),3) from so_scheduled_list select round(isnull(scheduling_size,0),3) from so_scheduled_list
<where> <where>
<if test="site != null and site != ''"> <if test="site != null and site != ''">
site=#{site}
and site=#{site}
</if> </if>
<if test="orderNo != null and orderNo != ''"> <if test="orderNo != null and orderNo != ''">
order_no=#{orderNo}
and order_no=#{orderNo}
</if> </if>
</where> </where>
</select> </select>
@ -16,10 +16,10 @@
select id,order_no,round(scheduling_size,3),site,part_no from so_scheduled_list select id,order_no,round(scheduling_size,3),site,part_no from so_scheduled_list
<where> <where>
<if test="site != null and site != ''"> <if test="site != null and site != ''">
site=#{site}
and site=#{site}
</if> </if>
<if test="orderNo != null and orderNo != ''"> <if test="orderNo != null and orderNo != ''">
order_no=#{orderNo}
and order_no=#{orderNo}
</if> </if>
</where> </where>
</select> </select>

Loading…
Cancel
Save