mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

生产工单物料需求清单

Browse Source
This commit is contained in:
DESKTOP-J7ED0MB\yinjinlu 2022-11-03 22:35:58 +08:00
parent 18d48a10e6
commit 8cf7f84ccf
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
View File

@ -17,6 +17,7 @@ import com.ktg.mes.pro.service.IProWorkorderBomService;
import io.minio.messages.Item; import io.minio.messages.Item;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
@ -198,22 +199,34 @@ public class ProWorkorderController extends BaseController
@GetMapping("/listItems") @GetMapping("/listItems")
public TableDataInfo listItemss(ProWorkorder proWorkorder) public TableDataInfo listItemss(ProWorkorder proWorkorder)
{ {
List<MdProductBom> list = getBoms(proWorkorder.getProductId(),proWorkorder.getQuantity()); List<MdProductBom> result = new ArrayList<MdProductBom>();
return getDataTable(list); ProWorkorderBom param = new ProWorkorderBom();
param.setWorkorderId(proWorkorder.getWorkorderId());
List<ProWorkorderBom> boms = proWorkorderBomService.selectProWorkorderBomList(param);
if(!CollectionUtils.isEmpty(boms)){
for ( ProWorkorderBom bom: boms
) {
MdProductBom theBom = new MdProductBom();
theBom.setBomItemId(bom.getItemId());
result.addAll(getBoms(theBom,bom.getQuantity()));
}
}
return getDataTable(result);
} }
private List<MdProductBom> getBoms(Long itemId,BigDecimal quantity){ private List<MdProductBom> getBoms(MdProductBom item,BigDecimal quantity){
MdProductBom param = new MdProductBom(); MdProductBom param = new MdProductBom();
List<MdProductBom> results = new ArrayList<MdProductBom>(); List<MdProductBom> results = new ArrayList<MdProductBom>();
param.setItemId(itemId); param.setItemId(item.getBomItemId());
List<MdProductBom> boms = mdProductBomService.selectMdProductBomList(param); List<MdProductBom> boms = mdProductBomService.selectMdProductBomList(param);
if(CollUtil.isNotEmpty(boms)){ if(CollUtil.isNotEmpty(boms)){
for (MdProductBom bomItem: boms for (MdProductBom bomItem: boms
) { ) {
bomItem.setQuantity(quantity.multiply(bomItem.getQuantity())); bomItem.setQuantity(quantity.multiply(bomItem.getQuantity()));
results.add(bomItem); results.addAll(getBoms(bomItem,bomItem.getQuantity()));
results.addAll(getBoms(bomItem.getBomItemId(),bomItem.getQuantity()));
} }
}else{
results.add(item);
} }
return results; return results;
} }