|
@@ -476,7 +476,7 @@ public class FbsWorkshopDispatchListController {
|
|
* @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>>
|
|
* @return org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.fbsPerson.entity.FbsPerson>>
|
|
*/
|
|
*/
|
|
@GetMapping(value = "/getFbsMomOrder")
|
|
@GetMapping(value = "/getFbsMomOrder")
|
|
- public Result<List<FbsMomOrderdetail>> getFbsMomOrder(){
|
|
|
|
|
|
+ public Result<List<FbsMomOrderdetail>> getFbsMomOrder(FbsMomOrderdetail fbsMomOrderdetail){
|
|
Result<List<FbsMomOrderdetail>> result =new Result<>();
|
|
Result<List<FbsMomOrderdetail>> result =new Result<>();
|
|
try {
|
|
try {
|
|
// QueryWrapper<FbsMomOrder> fbsMomOrderQueryWrapper=new QueryWrapper<>();
|
|
// QueryWrapper<FbsMomOrder> fbsMomOrderQueryWrapper=new QueryWrapper<>();
|
|
@@ -484,8 +484,10 @@ public class FbsWorkshopDispatchListController {
|
|
// fbsMomOrderQueryWrapper.lambda().orderByDesc(FbsMomOrder::getCreatetime);
|
|
// fbsMomOrderQueryWrapper.lambda().orderByDesc(FbsMomOrder::getCreatetime);
|
|
// List<FbsMomOrder> fbsMomOrderList=iFbsMomOrderService.list(fbsMomOrderQueryWrapper);
|
|
// List<FbsMomOrder> fbsMomOrderList=iFbsMomOrderService.list(fbsMomOrderQueryWrapper);
|
|
// result.setResult(fbsMomOrderList);
|
|
// result.setResult(fbsMomOrderList);
|
|
- FbsMomOrderdetail fbsMomOrderdetail=new FbsMomOrderdetail();
|
|
|
|
- List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
|
|
|
|
|
|
+// FbsMomOrderdetail fbsMomOrderdetail=new FbsMomOrderdetail();
|
|
|
|
+// List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatre(fbsMomOrderdetail);
|
|
|
|
+ List<FbsMomOrderdetail> fbsMomOrderdetailList= iFbsMomOrderdetailService.getMonthListStatreWork(fbsMomOrderdetail);
|
|
|
|
+// getMonthListStatreWork
|
|
//剩余数量为0的remove
|
|
//剩余数量为0的remove
|
|
getFbsMomOrderdetailList(fbsMomOrderdetailList);
|
|
getFbsMomOrderdetailList(fbsMomOrderdetailList);
|
|
result.setResult(fbsMomOrderdetailList);
|
|
result.setResult(fbsMomOrderdetailList);
|