|
@@ -2263,6 +2263,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
}
|
|
|
if (orderType.compareTo(1)==0){
|
|
|
List<Map<String, Object>> materialMesNew = omstruckOrderMapper.getMaterialMes(orderId, steelJudge);
|
|
|
+ System.out.println(materialMesNew + "物资查询数组");
|
|
|
//查询继续装的订单
|
|
|
List<BigDecimal> continueOrderIds = omstruckOrderMapper.selectContinueOrderId(orderId);
|
|
|
for (BigDecimal continueOrderId : continueOrderIds) {
|
|
@@ -2270,10 +2271,11 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
materialMesNew.addAll(materialMesNewContinue);
|
|
|
}
|
|
|
List<Map<String, Object>> materialId = omstruckOrderMapper.getMaterialId(orderId);
|
|
|
+
|
|
|
for (Map<String, Object> stringObjectMap : materialMesNew) {
|
|
|
for (Map<String, Object> objectMap : materialId) {
|
|
|
BigDecimal materialId2 = DataChange.dataToBigDecimal(stringObjectMap.get("saleMaterialId"));
|
|
|
- BigDecimal materialId1 = (BigDecimal) objectMap.get("saleMaterialId");
|
|
|
+ BigDecimal materialId1 = (BigDecimal) objectMap.get("saleMaterialId")
|
|
|
if (materialId2.compareTo(materialId1)==0){
|
|
|
//钢材长度
|
|
|
BigDecimal steelmeter = (BigDecimal) objectMap.get("steelmeter");
|