Quellcode durchsuchen

继续装米数显示。

xiaosonghong vor 2 Monaten
Ursprung
Commit
bdd8183af3

+ 4 - 1
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -2317,13 +2317,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         if (orderType.compareTo(1)==0){
             List<Map<String, Object>> materialMesNew = omstruckOrderMapper.getMaterialMesSteel(orderId);
+            List<Map<String, Object>> materialId = omstruckOrderMapper.getMaterialId(orderId);
             //查询继续装的订单
             List<BigDecimal> continueOrderIds = omstruckOrderMapper.selectContinueOrderId(orderId);
             for (BigDecimal continueOrderId : continueOrderIds) {
                 List<Map<String, Object>> materialMesNewContinue = omstruckOrderMapper.materialMesNewContinue(continueOrderId, steelJudge);
+                List<Map<String, Object>> materialIdOld = omstruckOrderMapper.getMaterialId(continueOrderId);
                 materialMesNew.addAll(materialMesNewContinue);
+                materialId.addAll(materialIdOld);
             }
-            List<Map<String, Object>> materialId = omstruckOrderMapper.getMaterialId(orderId);
+            //List<Map<String, Object>> materialId = omstruckOrderMapper.getMaterialId(orderId);
 
             for (Map<String, Object> stringObjectMap : materialMesNew) {
                 for (Map<String, Object> objectMap : materialId) {