Explorar el Código

'自动推单'

HUJIANGUO hace 3 años
padre
commit
d913d42f77

+ 1 - 1
src/main/java/com/steerinfo/dil/mapper/AmsSaleOrderMapper.java

@@ -119,7 +119,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     // 得到定向派单表id
     BigDecimal getDispatchId(BigDecimal saleOrderMaterialId);
     // 得到销售订单物资表主键
-    List<Map<String, Object>> getSaleMaterialId();
+    List<Map<String, Object>> getSaleMaterialId(BigDecimal saleOrderMaterialId);
     // 得到销售订单物资的集合
     List<Map<String, Object>> getSaleList(Map<String,Object> truckNoMap);
     // 副产品订单

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

@@ -628,7 +628,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             OmstruckOrder omstruckOrder = new OmstruckOrder();
             String orgCode =(String) mapValue.get("orgCode");
             if (orgCode==null||orgCode.equals("")){
-                return -1;
+
             }else {
                 omstruckOrder.setOptionerCode(orgCode);
             }

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

@@ -1261,7 +1261,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             omstruckOrder.setOrderStatus(new BigDecimal(7));
             omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
             // 得到销售订单物资表主键
-            List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId();
+            List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId(saleOrderMaterialId);
             for (Map<String, Object> map : saleMaterialIdList) {
                 // 删除销售订单物资子表
                 BigDecimal saleMaterialId = (BigDecimal) map.get("saleMaterialId");