luobang 1 vuosi sitten
vanhempi
commit
98d85cccfb

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

@@ -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");

+ 1 - 0
src/main/resources/com/steerinfo/dil/mapper/OmstrainOrderMapper.xml

@@ -574,6 +574,7 @@
                                    ASM.SALE_MATERIAL_ID                           "saleMaterialId",
                                    ASM.MATERIAL_NUMBER                            "materialNum",
                                    ASM.MATERIAL_WEIGHT                               "theoryWeight",
+                                   ASM.SALE_MAKE_DATE                              "makeOrderDate",
                                    ASM.EAS_PRIMARY_ID                             "closeEntryId",
                                    RC.CONSIGNEE_COMPANY_NAME                      "consigneeName",
                                    RC.CONSIGNEE_ID                                "consigneeId",